--- ganeti.old	2015-09-21 17:28:03.644124400 +0200
+++ ganeti.old	2015-09-21 16:03:06.409301644 +0200
@@ -11,12 +11,6 @@ 
 
 DAEMON_UTIL="/usr/lib/ganeti/daemon-util"
 
-is_master() {
-	[ -z "${ganeti_master}" ] && ganeti_master="$(gnt-cluster getmaster)"
-	[ -z "${local_hostname}" ] && local_hostname="$(hostname -f)"
-	[ "${ganeti_master}" = "${local_hostname}" ]
-}
-
 start() {
 	if ! [ -e ${DAEMON_UTIL} ]; then
 		eerror "Could not find daemon utility at ${DAEMON_UTIL}"
@@ -31,10 +25,6 @@ 
 	for daemon in $(${DAEMON_UTIL} list-start-daemons); do
 		optsvar="${daemon//-/_}"
 
-		case "${daemon#ganeti-}" in
-			masterd|rapi|luxid) is_master || continue;;
-		esac
-
 		eval daemon_opts=\"\$\{${optsvar^^*}_OPTS\}\"
 
 		ebegin "Starting ${daemon}"
@@ -73,9 +63,6 @@ 
 	local daemon
 
 	for daemon in $(${DAEMON_UTIL} list-stop-daemons) ; do \
-		case "${daemon#ganeti-}" in
-			masterd|rapi|luxid) is_master || continue;;
-		esac
 		${DAEMON_UTIL} stop ${daemon} ${GANETI_OPTS}
 	done
 }