+[Unit]
+Description=Ganeti Confd
+Requires=ganeti-noded.service
-+After=ganeti-rapi.service
++After=ganeti-noded.service ganeti-rapi.service
+ConditionPathExists=@LOCALSTATEDIR@/lib/ganeti/server.pem
+
+[Service]
+[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]
+[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]
+[Unit]
+Description=Ganeti mond
+Requires=ganeti-noded.service
-+After=ganeti-rapi.service ganeti-masterd.service
++After=ganeti-noded.service ganeti-masterd.service ganeti-rapi.service
+ConditionPathExists=@LOCALSTATEDIR@/lib/ganeti/server.pem
+
+[Service]