From: Jan Rękorajski <baggins@pld-linux.org>
Date: Wed, 5 Feb 2014 19:31:56 +0000 (+0100)
Subject: - don't try to start ganeti-masterd on non-master nodes
X-Git-Tag: auto/th/ganeti-2.9.3-1~10
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fganeti.git;a=commitdiff_plain;h=953cc34f99e9c439a55b170aff92eccd57b1ffcb

- don't try to start ganeti-masterd on non-master nodes
---

diff --git a/systemd.patch b/systemd.patch
index 543bd35..cc55bf3 100644
--- a/systemd.patch
+++ b/systemd.patch
@@ -49,7 +49,7 @@ 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
@@ -59,6 +59,7 @@ http://code.google.com/p/ganeti/issues/detail?id=444
 +[Service]
 +Type=forking
 +EnvironmentFile=-/etc/sysconfig/ganeti
++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=@GNTMASTERUSER@