--- ganeti-2.6.2/Makefile.am~ 2012-12-21 15:38:52.000000000 +0100
+++ ganeti-2.6.2/Makefile.am 2013-06-01 16:01:46.594026366 +0200
@@ -149,6 +149,7 @@
- devel/upload \
$(BUILT_EXAMPLES) \
doc/examples/bash_completion \
+ doc/examples/bash_completion-debug \
+ doc/examples/ganeti.target \
+ $(userspecs) \
lib/_generated_rpc.py \
$(man_MANS) \
- $(manhtml) \
-@@ -190,7 +190,11 @@
+@@ -190,7 +190,14 @@
doc/examples/ganeti.cron \
doc/examples/ganeti.initd \
doc/examples/gnt-config-backup \
+ doc/examples/ganeti-confd.service \
+ doc/examples/ganeti-masterd.service \
+ doc/examples/ganeti-noded.service \
-+ doc/examples/ganeti-rapi.service
++ doc/examples/ganeti-luxid.service \
++ doc/examples/ganeti-mond.service \
++ doc/examples/ganeti-rapi.service \
++ doc/examples/ganeti.sudoers
nodist_pkgpython_PYTHON = \
$(BUILT_PYTHON_SOURCES)
@@ -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@
+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
@@ -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
+[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@
+
+[Install]
+WantedBy=ganeti.target
+--- ganeti-2.6.2/doc/examples.orig/ganeti-luxid.service.in 1970-01-01 01:00:00.000000000 +0100
++++ ganeti-2.6.2/doc/examples/ganeti-luxid.service.in 2013-06-01 15:55:37.594893846 +0200
+@@ -0,0 +1,18 @@
++[Unit]
++Description=Ganeti luxid
++Requires=ganeti-noded.service ganeti-masterd.service 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
++EnvironmentFile=-/etc/sysconfig/ganeti
++ExecStartPre=/usr/bin/sudo @PKGLIBDIR@/ensure-dirs
++ExecStart=@PREFIX@/sbin/ganeti-luxid $LUXID_ARGS
++User=@GNTLUXIDUSER@
++Group=@GNTLUXIDGROUP@
++PIDFile=@LOCALSTATEDIR@/run/ganeti/ganeti-luxid.pid
++KillMode=process
++
++[Install]
++WantedBy=ganeti.target
+--- ganeti-2.6.2/doc/examples.orig/ganeti-mond.service.in 1970-01-01 01:00:00.000000000 +0100
++++ ganeti-2.6.2/doc/examples/ganeti-mond.service.in 2013-06-01 15:55:37.594893846 +0200
+@@ -0,0 +1,18 @@
++[Unit]
++Description=Ganeti mond
++Requires=ganeti-noded.service
++After=ganeti-noded.service ganeti-masterd.service ganeti-rapi.service
++ConditionPathExists=@LOCALSTATEDIR@/lib/ganeti/server.pem
++
++[Service]
++Type=forking
++EnvironmentFile=-/etc/sysconfig/ganeti
++ExecStartPre=@PKGLIBDIR@/ensure-dirs
++ExecStart=@PREFIX@/sbin/ganeti-mond $MOND_ARGS
++User=@GNTMONDUSER@
++Group=@GNTMONDGROUP@
++PIDFile=@LOCALSTATEDIR@/run/ganeti/ganeti-mond.pid
++KillMode=process
++
++[Install]
++WantedBy=ganeti.target
--- ganeti-2.6.2/doc/examples.orig/ganeti.target 1970-01-01 01:00:00.000000000 +0100
+++ ganeti-2.6.2/doc/examples/ganeti.target 2013-06-01 15:55:37.661561129 +0200
@@ -0,0 +1,5 @@
+
+[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:
+