Revision f9d20654 lib/cmdlib.py
b/lib/cmdlib.py | ||
---|---|---|
1355 | 1355 |
"""Destroys the cluster. |
1356 | 1356 |
|
1357 | 1357 |
""" |
1358 |
(master, ip, dev, netmask, family) = self.cfg.GetMasterNetworkParameters()
|
|
1358 |
master_params = self.cfg.GetMasterNetworkParameters()
|
|
1359 | 1359 |
|
1360 | 1360 |
# Run post hooks on master node before it's removed |
1361 |
_RunPostHook(self, master) |
|
1361 |
_RunPostHook(self, master_params.name)
|
|
1362 | 1362 |
|
1363 |
result = self.rpc.call_node_deactivate_master_ip(master, ip, netmask, dev, |
|
1364 |
family) |
|
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) |
|
1365 | 1368 |
result.Raise("Could not disable the master role") |
1366 | 1369 |
|
1367 |
return master |
|
1370 |
return master_params.name
|
|
1368 | 1371 |
|
1369 | 1372 |
|
1370 | 1373 |
def _VerifyCertificate(filename): |
... | ... | |
3327 | 3330 |
new_ip = self.ip |
3328 | 3331 |
|
3329 | 3332 |
# shutdown the master IP |
3330 |
(master, ip, dev, netmask, family) = self.cfg.GetMasterNetworkParameters() |
|
3331 |
result = self.rpc.call_node_deactivate_master_ip(master, ip, netmask, dev, |
|
3332 |
family) |
|
3333 |
master_params = self.cfg.GetMasterNetworkParameters() |
|
3334 |
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) |
|
3333 | 3339 |
result.Raise("Could not disable the master role") |
3334 | 3340 |
|
3335 | 3341 |
try: |
... | ... | |
3342 | 3348 |
ssh.WriteKnownHostsFile(self.cfg, constants.SSH_KNOWN_HOSTS_FILE) |
3343 | 3349 |
node_list = self.cfg.GetOnlineNodeList() |
3344 | 3350 |
try: |
3345 |
node_list.remove(master) |
|
3351 |
node_list.remove(master_params.name)
|
|
3346 | 3352 |
except ValueError: |
3347 | 3353 |
pass |
3348 | 3354 |
_UploadHelper(self, node_list, constants.SSH_KNOWN_HOSTS_FILE) |
3349 | 3355 |
finally: |
3350 |
result = self.rpc.call_node_activate_master_ip(master, new_ip, netmask, |
|
3351 |
dev, family) |
|
3356 |
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 | 3361 |
msg = result.fail_msg |
3353 | 3362 |
if msg: |
3354 | 3363 |
self.LogWarning("Could not re-enable the master role on" |
... | ... | |
3702 | 3711 |
helper_os("blacklisted_os", self.op.blacklisted_os, "blacklisted") |
3703 | 3712 |
|
3704 | 3713 |
if self.op.master_netdev: |
3705 |
(master, ip, dev, netmask, family) = self.cfg.GetMasterNetworkParameters()
|
|
3714 |
master_params = self.cfg.GetMasterNetworkParameters()
|
|
3706 | 3715 |
feedback_fn("Shutting down master ip on the current netdev (%s)" % |
3707 | 3716 |
self.cluster.master_netdev) |
3708 |
result = self.rpc.call_node_deactivate_master_ip(master, ip, netmask, dev, |
|
3709 |
family) |
|
3717 |
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 | 3722 |
result.Raise("Could not disable the master ip") |
3711 | 3723 |
feedback_fn("Changing master_netdev from %s to %s" % |
3712 |
(dev, self.op.master_netdev)) |
|
3724 |
(master_params.netdev, self.op.master_netdev))
|
|
3713 | 3725 |
self.cluster.master_netdev = self.op.master_netdev |
3714 | 3726 |
|
3715 | 3727 |
if self.op.master_netmask: |
3716 |
(master, ip, dev, old_netmask, _) = self.cfg.GetMasterNetworkParameters()
|
|
3728 |
master_params = self.cfg.GetMasterNetworkParameters()
|
|
3717 | 3729 |
feedback_fn("Changing master IP netmask to %s" % self.op.master_netmask) |
3718 |
result = self.rpc.call_node_change_master_netmask(master, old_netmask, |
|
3730 |
result = self.rpc.call_node_change_master_netmask(master_params.name, |
|
3731 |
master_params.netmask, |
|
3719 | 3732 |
self.op.master_netmask, |
3720 |
ip, dev) |
|
3733 |
master_params.ip, |
|
3734 |
master_params.netdev) |
|
3721 | 3735 |
if result.fail_msg: |
3722 | 3736 |
msg = "Could not change the master IP netmask: %s" % result.fail_msg |
3723 | 3737 |
self.LogWarning(msg) |
... | ... | |
3728 | 3742 |
self.cfg.Update(self.cluster, feedback_fn) |
3729 | 3743 |
|
3730 | 3744 |
if self.op.master_netdev: |
3731 |
(master, ip, dev, netmask, family) = self.cfg.GetMasterNetworkParameters()
|
|
3745 |
master_params = self.cfg.GetMasterNetworkParameters()
|
|
3732 | 3746 |
feedback_fn("Starting the master ip on the new master netdev (%s)" % |
3733 | 3747 |
self.op.master_netdev) |
3734 |
result = self.rpc.call_node_activate_master_ip(master, ip, netmask, dev, |
|
3735 |
family) |
|
3748 |
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) |
|
3736 | 3753 |
if result.fail_msg: |
3737 | 3754 |
self.LogWarning("Could not re-enable the master ip on" |
3738 | 3755 |
" the master, please restart manually: %s", |
... | ... | |
3894 | 3911 |
"""Activate the master IP. |
3895 | 3912 |
|
3896 | 3913 |
""" |
3897 |
(master, ip, dev, netmask, family) = self.cfg.GetMasterNetworkParameters() |
|
3898 |
self.rpc.call_node_activate_master_ip(master, ip, netmask, dev, family) |
|
3914 |
master_params = self.cfg.GetMasterNetworkParameters() |
|
3915 |
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) |
|
3899 | 3920 |
|
3900 | 3921 |
|
3901 | 3922 |
class LUClusterDeactivateMasterIp(NoHooksLU): |
... | ... | |
3906 | 3927 |
"""Deactivate the master IP. |
3907 | 3928 |
|
3908 | 3929 |
""" |
3909 |
(master, ip, dev, netmask, family) = self.cfg.GetMasterNetworkParameters() |
|
3910 |
self.rpc.call_node_deactivate_master_ip(master, ip, netmask, dev, family) |
|
3930 |
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) |
|
3911 | 3936 |
|
3912 | 3937 |
|
3913 | 3938 |
def _WaitForSync(lu, instance, disks=None, oneshot=False): |
Also available in: Unified diff