- final, I hope, systemd services ordering fixes

[packages/ganeti.git] / systemd.patch

diff --git a/systemd.patch b/systemd.patch
index b2cf51f04267d08e8137e1d92486248fef2c093f..4a550d67decd610762393c9f145a19b7314da480 100644 (file)
--- a/systemd.patch
+++ b/systemd.patch
@@ -10,7 +10,7 @@ http://code.google.com/p/ganeti/issues/detail?id=444
        $(userspecs) \
        lib/_generated_rpc.py \
        $(man_MANS) \
-@@ -190,7 +190,13 @@
+@@ -190,7 +190,14 @@
        doc/examples/ganeti.cron \
        doc/examples/ganeti.initd \
        doc/examples/gnt-config-backup \
@@ -21,7 +21,8 @@ http://code.google.com/p/ganeti/issues/detail?id=444
 +      doc/examples/ganeti-noded.service \
 +      doc/examples/ganeti-luxid.service \
 +      doc/examples/ganeti-mond.service \
-+      doc/examples/ganeti-rapi.service
++      doc/examples/ganeti-rapi.service \
++      doc/examples/ganeti.sudoers
  
  nodist_pkgpython_PYTHON = \
        $(BUILT_PYTHON_SOURCES)
@@ -30,14 +31,14 @@ http://code.google.com/p/ganeti/issues/detail?id=444
 @@ -0,0 +1,18 @@
 +[Unit]
 +Description=Ganeti Confd
-+Requires=ganeti-noded.service ganeti-masterd.service ganeti-rapi.service
-+After=ganeti-rapi.service
++Requires=ganeti-noded.service
++After=ganeti-noded.service ganeti-rapi.service
++ConditionPathExists=@LOCALSTATEDIR@/lib/ganeti/server.pem
 +
 +[Service]
 +Type=forking
-+ConditionPathExists=@LOCALSTATEDIR@/lib/ganeti/server.pem
 +EnvironmentFile=-/etc/sysconfig/ganeti
-+ExecStartPre=@PKGLIBDIR@/ensure-dirs
++ExecStartPre=/usr/bin/sudo @PKGLIBDIR@/ensure-dirs
 +ExecStart=@PREFIX@/sbin/ganeti-confd $CONFD_ARGS
 +User=@GNTCONFDUSER@
 +Group=@GNTCONFDGROUP@
@@ -48,20 +49,21 @@ http://code.google.com/p/ganeti/issues/detail?id=444
 +WantedBy=ganeti.target
 --- ganeti-2.6.2/doc/examples.orig/ganeti-masterd.service.in   1970-01-01 01:00:00.000000000 +0100
 +++ ganeti-2.6.2/doc/examples/ganeti-masterd.service.in        2013-06-01 15:55:37.611560663 +0200
-@@ -0,0 +1,19 @@
+@@ -0,0 +1,20 @@
 +[Unit]
 +Description=Ganeti Masterd
 +Requires=ganeti-noded.service
 +After=ganeti-noded.service
++ConditionPathExists=@LOCALSTATEDIR@/lib/ganeti/server.pem
 +
 +[Service]
 +Type=forking
-+ConditionPathExists=@LOCALSTATEDIR@/lib/ganeti/server.pem
 +EnvironmentFile=-/etc/sysconfig/ganeti
-+ExecStartPre=@PKGLIBDIR@/ensure-dirs
++ExecStartPre=/bin/sh -c '[ "$(cat @LOCALSTATEDIR@/lib/ganeti/ssconf_master_node 2>/dev/null)" = "$(hostname -f 2>/dev/null)" ]'
++ExecStartPre=/usr/bin/sudo @PKGLIBDIR@/ensure-dirs
 +ExecStart=@PREFIX@/sbin/ganeti-masterd $MASTERD_ARGS
-+User=@GNTNODEDUSER@
-+Group=@GNTDAEMONSGROUP@
++User=@GNTMASTERUSER@
++Group=@GNTMASTERDGROUP@
 +PIDFile=@LOCALSTATEDIR@/run/ganeti/ganeti-masterd.pid
 +# TODO: Should KillMode be process?
 +KillMode=control-group
@@ -73,10 +75,10 @@ http://code.google.com/p/ganeti/issues/detail?id=444
 @@ -0,0 +1,16 @@
 +[Unit]
 +Description=Ganeti Noded
++ConditionPathExists=@LOCALSTATEDIR@/lib/ganeti/server.pem
 +
 +[Service]
 +Type=forking
-+ConditionPathExists=@LOCALSTATEDIR@/lib/ganeti/server.pem
 +EnvironmentFile=-/etc/sysconfig/ganeti
 +ExecStartPre=@PKGLIBDIR@/ensure-dirs
 +ExecStart=@PREFIX@/sbin/ganeti-noded $NODED_ARGS
@@ -93,13 +95,13 @@ http://code.google.com/p/ganeti/issues/detail?id=444
 +[Unit]
 +Description=Ganeti RAPI
 +Requires=ganeti-noded.service ganeti-masterd.service
-+After=ganeti-masterd.service
++After=ganeti-noded.service ganeti-masterd.service
++ConditionPathExists=@LOCALSTATEDIR@/lib/ganeti/server.pem
 +
 +[Service]
 +Type=forking
-+ConditionPathExists=@LOCALSTATEDIR@/lib/ganeti/server.pem
 +EnvironmentFile=-/etc/sysconfig/ganeti
-+ExecStartPre=@PKGLIBDIR@/ensure-dirs
++ExecStartPre=/usr/bin/sudo @PKGLIBDIR@/ensure-dirs
 +ExecStart=@PREFIX@/sbin/ganeti-rapi $RAPI_ARGS
 +User=@GNTRAPIUSER@
 +Group=@GNTRAPIGROUP@
@@ -114,13 +116,13 @@ http://code.google.com/p/ganeti/issues/detail?id=444
 +[Unit]
 +Description=Ganeti luxid
 +Requires=ganeti-noded.service ganeti-masterd.service ganeti-rapi.service
-+After=ganeti-rapi.service
++After=ganeti-noded.service ganeti-masterd.service ganeti-rapi.service ganeti-confd.service
++ConditionPathExists=@LOCALSTATEDIR@/lib/ganeti/server.pem
 +
 +[Service]
 +Type=forking
-+ConditionPathExists=@LOCALSTATEDIR@/lib/ganeti/server.pem
 +EnvironmentFile=-/etc/sysconfig/ganeti
-+ExecStartPre=@PKGLIBDIR@/ensure-dirs
++ExecStartPre=/usr/bin/sudo @PKGLIBDIR@/ensure-dirs
 +ExecStart=@PREFIX@/sbin/ganeti-luxid $LUXID_ARGS
 +User=@GNTLUXIDUSER@
 +Group=@GNTLUXIDGROUP@
@@ -134,12 +136,12 @@ http://code.google.com/p/ganeti/issues/detail?id=444
 @@ -0,0 +1,18 @@
 +[Unit]
 +Description=Ganeti mond
-+Requires=ganeti-noded.service ganeti-masterd.service ganeti-rapi.service
-+After=ganeti-rapi.service
++Requires=ganeti-noded.service
++After=ganeti-noded.service ganeti-masterd.service ganeti-rapi.service
++ConditionPathExists=@LOCALSTATEDIR@/lib/ganeti/server.pem
 +
 +[Service]
 +Type=forking
-+ConditionPathExists=@LOCALSTATEDIR@/lib/ganeti/server.pem
 +EnvironmentFile=-/etc/sysconfig/ganeti
 +ExecStartPre=@PKGLIBDIR@/ensure-dirs
 +ExecStart=@PREFIX@/sbin/ganeti-mond $MOND_ARGS
@@ -158,12 +160,18 @@ http://code.google.com/p/ganeti/issues/detail?id=444
 +
 +[Install]
 +WantedBy=multi-user.target
+--- ganeti-2.6.2/doc/examples.orig/ganeti.sudoers.in   1970-01-01 01:00:00.000000000 +0100
++++ ganeti-2.6.2/doc/examples/ganeti.sudoers.in        2013-06-01 15:55:37.661561129 +0200
+@@ -0,0 +1,3 @@
++User_Alias GANETI = @GNTCONFDUSER@, @GNTMASTERUSER@, @GNTRAPIUSER@, @GNTLUXIDUSER@
++
++GANETI        ALL=(ALL) NOPASSWD: @PKGLIBDIR@/ensure-dirs
 --- ganeti-2.6.2/doc/examples.orig/README.systemd      1970-01-01 01:00:00.000000000 +0100
 +++ ganeti-2.6.2/doc/examples/README.systemd   2013-06-01 15:55:37.661561129 +0200
 @@ -0,0 +1,14 @@
 +To register the services with ganeti.target (order doesn't matter):
 +
-+    systemctl enable ganeti-noded ganeti-masterd ganeti-rapi
++    systemctl enable ganeti-noded ganeti-masterd ganeti-rapi ganeti-mond
 +
 +To include confd:
 +