Commit d489ca4f authored by Guido Trotter's avatar Guido Trotter
Browse files

When removing a node don't ssh to it

Even in 1.2 this behaviour is broken, as the rpc call will remove the
ssh keys before we get a chance to log in. Now the rpc takes care of
shutting down the node daemon as well, so we definitely can avoid this.

This makes the LURemoveNode operation work again with the threaded
master daemon.

Reviewed-by: iustinp
parent 9ae49f27
......@@ -1241,8 +1241,6 @@ class LURemoveNode(LogicalUnit):
rpc.call_node_leave_cluster(node.name)
self.ssh.Run(node.name, 'root', "%s stop" % constants.NODE_INITD_SCRIPT)
logger.Info("Removing node %s from config" % node.name)
self.cfg.RemoveNode(node.name)
......
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