Revision 91ae95fd lib/cmdlib.py
b/lib/cmdlib.py | ||
---|---|---|
1355 | 1355 |
"""Destroys the cluster. |
1356 | 1356 |
|
1357 | 1357 |
""" |
1358 |
(master, ip, dev, netmask, _) = self.cfg.GetMasterNetworkParameters()
|
|
1358 |
(master, ip, dev, netmask, family) = self.cfg.GetMasterNetworkParameters()
|
|
1359 | 1359 |
|
1360 | 1360 |
# Run post hooks on master node before it's removed |
1361 | 1361 |
_RunPostHook(self, master) |
1362 | 1362 |
|
1363 |
result = self.rpc.call_node_deactivate_master_ip(master, ip, netmask, dev) |
|
1363 |
result = self.rpc.call_node_deactivate_master_ip(master, ip, netmask, dev, |
|
1364 |
family) |
|
1364 | 1365 |
result.Raise("Could not disable the master role") |
1365 | 1366 |
|
1366 | 1367 |
return master |
... | ... | |
3327 | 3328 |
|
3328 | 3329 |
# shutdown the master IP |
3329 | 3330 |
(master, ip, dev, netmask, family) = self.cfg.GetMasterNetworkParameters() |
3330 |
result = self.rpc.call_node_deactivate_master_ip(master, ip, netmask, dev) |
|
3331 |
result = self.rpc.call_node_deactivate_master_ip(master, ip, netmask, dev, |
|
3332 |
family) |
|
3331 | 3333 |
result.Raise("Could not disable the master role") |
3332 | 3334 |
|
3333 | 3335 |
try: |
... | ... | |
3700 | 3702 |
helper_os("blacklisted_os", self.op.blacklisted_os, "blacklisted") |
3701 | 3703 |
|
3702 | 3704 |
if self.op.master_netdev: |
3703 |
(master, ip, dev, netmask, _) = self.cfg.GetMasterNetworkParameters()
|
|
3705 |
(master, ip, dev, netmask, family) = self.cfg.GetMasterNetworkParameters()
|
|
3704 | 3706 |
feedback_fn("Shutting down master ip on the current netdev (%s)" % |
3705 | 3707 |
self.cluster.master_netdev) |
3706 |
result = self.rpc.call_node_deactivate_master_ip(master, ip, netmask, dev) |
|
3708 |
result = self.rpc.call_node_deactivate_master_ip(master, ip, netmask, dev, |
|
3709 |
family) |
|
3707 | 3710 |
result.Raise("Could not disable the master ip") |
3708 | 3711 |
feedback_fn("Changing master_netdev from %s to %s" % |
3709 | 3712 |
(dev, self.op.master_netdev)) |
... | ... | |
3903 | 3906 |
"""Deactivate the master IP. |
3904 | 3907 |
|
3905 | 3908 |
""" |
3906 |
(master, ip, dev, netmask, _) = self.cfg.GetMasterNetworkParameters()
|
|
3907 |
self.rpc.call_node_deactivate_master_ip(master, ip, netmask, dev) |
|
3909 |
(master, ip, dev, netmask, family) = self.cfg.GetMasterNetworkParameters()
|
|
3910 |
self.rpc.call_node_deactivate_master_ip(master, ip, netmask, dev, family)
|
|
3908 | 3911 |
|
3909 | 3912 |
|
3910 | 3913 |
def _WaitForSync(lu, instance, disks=None, oneshot=False): |
Also available in: Unified diff