Revision 8da2bd43 lib/cmdlib.py

b/lib/cmdlib.py
3323 3323

  
3324 3324
    """
3325 3325
    clustername = self.op.name
3326
    ip = self.ip
3326
    new_ip = self.ip
3327 3327

  
3328 3328
    # shutdown the master IP
3329
    master = self.cfg.GetMasterNode()
3329
    (master, _, dev, netmask, family) = self.cfg.GetMasterNetworkParameters()
3330 3330
    result = self.rpc.call_node_deactivate_master_ip(master)
3331 3331
    result.Raise("Could not disable the master role")
3332 3332

  
3333 3333
    try:
3334 3334
      cluster = self.cfg.GetClusterInfo()
3335 3335
      cluster.cluster_name = clustername
3336
      cluster.master_ip = ip
3336
      cluster.master_ip = new_ip
3337 3337
      self.cfg.Update(cluster, feedback_fn)
3338 3338

  
3339 3339
      # update the known hosts file
......
3345 3345
        pass
3346 3346
      _UploadHelper(self, node_list, constants.SSH_KNOWN_HOSTS_FILE)
3347 3347
    finally:
3348
      result = self.rpc.call_node_activate_master_ip(master)
3348
      result = self.rpc.call_node_activate_master_ip(master, new_ip, netmask,
3349
                                                     dev, family)
3349 3350
      msg = result.fail_msg
3350 3351
      if msg:
3351 3352
        self.LogWarning("Could not re-enable the master role on"
......
3723 3724
    self.cfg.Update(self.cluster, feedback_fn)
3724 3725

  
3725 3726
    if self.op.master_netdev:
3727
      (master, ip, dev, netmask, family) = self.cfg.GetMasterNetworkParameters()
3726 3728
      feedback_fn("Starting the master ip on the new master netdev (%s)" %
3727 3729
                  self.op.master_netdev)
3728
      result = self.rpc.call_node_activate_master_ip(master)
3730
      result = self.rpc.call_node_activate_master_ip(master, ip, netmask, dev,
3731
                                                     family)
3729 3732
      if result.fail_msg:
3730 3733
        self.LogWarning("Could not re-enable the master ip on"
3731 3734
                        " the master, please restart manually: %s",
......
3887 3890
    """Activate the master IP.
3888 3891

  
3889 3892
    """
3890
    master = self.cfg.GetMasterNode()
3891
    self.rpc.call_node_activate_master_ip(master)
3893
    (master, ip, dev, netmask, family) = self.cfg.GetMasterNetworkParameters()
3894
    self.rpc.call_node_activate_master_ip(master, ip, netmask, dev, family)
3892 3895

  
3893 3896

  
3894 3897
class LUClusterDeactivateMasterIp(NoHooksLU):

Also available in: Unified diff