Revision fb460cf7 lib/cmdlib.py

b/lib/cmdlib.py
1355 1355
    # Run post hooks on master node before it's removed
1356 1356
    _RunPostHook(self, master)
1357 1357

  
1358
    result = self.rpc.call_node_stop_master(master, False)
1358
    result = self.rpc.call_node_deactivate_master_ip(master)
1359 1359
    result.Raise("Could not disable the master role")
1360 1360

  
1361 1361
    return master
......
3297 3297

  
3298 3298
    # shutdown the master IP
3299 3299
    master = self.cfg.GetMasterNode()
3300
    result = self.rpc.call_node_stop_master(master, False)
3300
    result = self.rpc.call_node_deactivate_master_ip(master)
3301 3301
    result.Raise("Could not disable the master role")
3302 3302

  
3303 3303
    try:
......
3315 3315
        pass
3316 3316
      _UploadHelper(self, node_list, constants.SSH_KNOWN_HOSTS_FILE)
3317 3317
    finally:
3318
      result = self.rpc.call_node_start_master(master, False, False)
3318
      result = self.rpc.call_node_activate_master_ip(master)
3319 3319
      msg = result.fail_msg
3320 3320
      if msg:
3321 3321
        self.LogWarning("Could not re-enable the master role on"
......
3648 3648
      master = self.cfg.GetMasterNode()
3649 3649
      feedback_fn("Shutting down master ip on the current netdev (%s)" %
3650 3650
                  self.cluster.master_netdev)
3651
      result = self.rpc.call_node_stop_master(master, False)
3651
      result = self.rpc.call_node_deactivate_master_ip(master)
3652 3652
      result.Raise("Could not disable the master ip")
3653 3653
      feedback_fn("Changing master_netdev from %s to %s" %
3654 3654
                  (self.cluster.master_netdev, self.op.master_netdev))
......
3659 3659
    if self.op.master_netdev:
3660 3660
      feedback_fn("Starting the master ip on the new master netdev (%s)" %
3661 3661
                  self.op.master_netdev)
3662
      result = self.rpc.call_node_start_master(master, False, False)
3662
      result = self.rpc.call_node_activate_master_ip(master)
3663 3663
      if result.fail_msg:
3664 3664
        self.LogWarning("Could not re-enable the master ip on"
3665 3665
                        " the master, please restart manually: %s",

Also available in: Unified diff