Commit 00b72896 authored by Jose A. Lopes's avatar Jose A. Lopes Committed by Jose A. Lopes

Start-master/stop-master always fail if confd is disabled

In 'daemons/daemon-util.in', 'start-master' and 'stop-master' always
fail if confd is disabled.

Fixes issue 685.
Signed-off-by: default avatarJose A. Lopes <jabolopes@gmail.com>
Reviewed-by: default avatarKlaus Aehlig <aehlig@google.com>
parent 02a6b50a
......@@ -292,14 +292,20 @@ check_and_start() {
start_master() {
start ganeti-masterd
start ganeti-rapi
_confd_enabled && start ganeti-luxid
if _confd_enabled; then
start ganeti-luxid
else
return 0
fi
}
# Stops the master role
stop_master() {
if _confd_enabled ; then
stop ganeti-luxid
fi
stop ganeti-rapi
stop ganeti-masterd
_confd_enabled && stop ganeti-luxid
}
# Start all daemons
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment