Revision c79198a0 lib/cmdlib.py

b/lib/cmdlib.py
1361 1361
    _RunPostHook(self, master_params.name)
1362 1362

  
1363 1363
    result = self.rpc.call_node_deactivate_master_ip(master_params.name,
1364
                                                     master_params.ip,
1365
                                                     master_params.netmask,
1366
                                                     master_params.netdev,
1367
                                                     master_params.ip_family)
1364
                                                     master_params)
1368 1365
    result.Raise("Could not disable the master role")
1369 1366

  
1370 1367
    return master_params.name
......
3332 3329
    # shutdown the master IP
3333 3330
    master_params = self.cfg.GetMasterNetworkParameters()
3334 3331
    result = self.rpc.call_node_deactivate_master_ip(master_params.name,
3335
                                                     master_params.ip,
3336
                                                     master_params.netmask,
3337
                                                     master_params.netdev,
3338
                                                     master_params.ip_family)
3332
                                                     master_params)
3339 3333
    result.Raise("Could not disable the master role")
3340 3334

  
3341 3335
    try:
......
3353 3347
        pass
3354 3348
      _UploadHelper(self, node_list, constants.SSH_KNOWN_HOSTS_FILE)
3355 3349
    finally:
3350
      master_params.ip = new_ip
3356 3351
      result = self.rpc.call_node_activate_master_ip(master_params.name,
3357
                                                     new_ip,
3358
                                                     master_params.netmask,
3359
                                                     master_params.netdev,
3360
                                                     master_params.ip_family)
3352
                                                     master_params)
3361 3353
      msg = result.fail_msg
3362 3354
      if msg:
3363 3355
        self.LogWarning("Could not re-enable the master role on"
......
3715 3707
      feedback_fn("Shutting down master ip on the current netdev (%s)" %
3716 3708
                  self.cluster.master_netdev)
3717 3709
      result = self.rpc.call_node_deactivate_master_ip(master_params.name,
3718
                                                       master_params.ip,
3719
                                                       master_params.netmask,
3720
                                                       master_params.netdev,
3721
                                                       master_params.ip_family)
3710
                                                       master_params)
3722 3711
      result.Raise("Could not disable the master ip")
3723 3712
      feedback_fn("Changing master_netdev from %s to %s" %
3724 3713
                  (master_params.netdev, self.op.master_netdev))
......
3746 3735
      feedback_fn("Starting the master ip on the new master netdev (%s)" %
3747 3736
                  self.op.master_netdev)
3748 3737
      result = self.rpc.call_node_activate_master_ip(master_params.name,
3749
                                                     master_params.ip,
3750
                                                     master_params.netmask,
3751
                                                     master_params.netdev,
3752
                                                     master_params.ip_family)
3738
                                                     master_params)
3753 3739
      if result.fail_msg:
3754 3740
        self.LogWarning("Could not re-enable the master ip on"
3755 3741
                        " the master, please restart manually: %s",
......
3913 3899
    """
3914 3900
    master_params = self.cfg.GetMasterNetworkParameters()
3915 3901
    self.rpc.call_node_activate_master_ip(master_params.name,
3916
                                          master_params.ip,
3917
                                          master_params.netmask,
3918
                                          master_params.netdev,
3919
                                          master_params.ip_family)
3902
                                          master_params)
3920 3903

  
3921 3904

  
3922 3905
class LUClusterDeactivateMasterIp(NoHooksLU):
......
3928 3911

  
3929 3912
    """
3930 3913
    master_params = self.cfg.GetMasterNetworkParameters()
3931
    self.rpc.call_node_deactivate_master_ip(master_params.name,
3932
                                            master_params.ip,
3933
                                            master_params.netmask,
3934
                                            master_params.netdev,
3935
                                            master_params.ip_family)
3914
    self.rpc.call_node_deactivate_master_ip(master_params.name, master_params)
3936 3915

  
3937 3916

  
3938 3917
def _WaitForSync(lu, instance, disks=None, oneshot=False):

Also available in: Unified diff