Commit 0a446fc8 authored by Petr Pudlak's avatar Petr Pudlak
Browse files

Merge branch 'stable-2.9' into stable-2.10



* stable-2.9
  Stop MonD when removing a node from a cluster
Signed-off-by: default avatarPetr Pudlak <pudlak@google.com>
Reviewed-by: default avatarHrvoje Ribicic <riba@google.com>
parents 3a0a4a5f 8204efcf
......@@ -575,10 +575,8 @@ def LeaveCluster(modify_ssh_setup):
except: # pylint: disable=W0702
logging.exception("Error while removing cluster secrets")
result = utils.RunCmd([pathutils.DAEMON_UTIL, "stop", constants.CONFD])
if result.failed:
logging.error("Command %s failed with exitcode %s and error %s",
result.cmd, result.exit_code, result.output)
utils.StopDaemon(constants.CONFD)
utils.StopDaemon(constants.MOND)
# Raise a custom exception (handled in ganeti-noded)
raise errors.QuitGanetiException(True, "Shutdown scheduled")
......
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