Revision 1c65840b lib/cmdlib.py

b/lib/cmdlib.py
416 416

  
417 417
    """
418 418
    master = self.sstore.GetMasterNode()
419
    if not rpc.call_node_stop_master(master):
419
    if not rpc.call_node_stop_master(master, False):
420 420
      raise errors.OpExecError("Could not disable the master role")
421 421
    priv_key, pub_key, _ = ssh.GetUserFiles(constants.GANETI_RUNAS)
422 422
    utils.CreateBackup(priv_key)
......
962 962

  
963 963
    # shutdown the master IP
964 964
    master = ss.GetMasterNode()
965
    if not rpc.call_node_stop_master(master):
965
    if not rpc.call_node_stop_master(master, False):
966 966
      raise errors.OpExecError("Could not disable the master role")
967 967

  
968 968
    try:
......
985 985
            logger.Error("copy of file %s to node %s failed" %
986 986
                         (fname, to_node))
987 987
    finally:
988
      if not rpc.call_node_start_master(master):
988
      if not rpc.call_node_start_master(master, False):
989 989
        logger.Error("Could not re-enable the master role on the master,"
990 990
                     " please restart manually.")
991 991

  
......
1737 1737
    logger.Info("setting master to %s, old master: %s" %
1738 1738
                (self.new_master, self.old_master))
1739 1739

  
1740
    if not rpc.call_node_stop_master(self.old_master):
1740
    if not rpc.call_node_stop_master(self.old_master, True):
1741 1741
      logger.Error("could disable the master role on the old master"
1742 1742
                   " %s, please disable manually" % self.old_master)
1743 1743

  
......
1748 1748
      logger.Error("could not distribute the new simple store master file"
1749 1749
                   " to the other nodes, please check.")
1750 1750

  
1751
    if not rpc.call_node_start_master(self.new_master):
1751
    if not rpc.call_node_start_master(self.new_master, True):
1752 1752
      logger.Error("could not start the master role on the new master"
1753 1753
                   " %s, please check" % self.new_master)
1754 1754
      feedback_fn("Error in activating the master IP on the new master,"

Also available in: Unified diff