Revision 41e079ce
| b/lib/backend.py | ||
|---|---|---|
| 412 | 412 |
result.cmd, result.exit_code, result.output) |
| 413 | 413 |
|
| 414 | 414 |
|
| 415 |
def ChangeMasterNetmask(netmask):
|
|
| 415 |
def ChangeMasterNetmask(old_netmask, netmask, master_ip, master_netdev):
|
|
| 416 | 416 |
"""Change the netmask of the master IP. |
| 417 | 417 |
|
| 418 |
@param old_netmask: the old value of the netmask |
|
| 419 |
@param netmask: the new value of the netmask |
|
| 420 |
@param master_ip: the master IP |
|
| 421 |
@param master_netdev: the master network device |
|
| 422 |
|
|
| 418 | 423 |
""" |
| 419 |
master_netdev, master_ip, _, _, old_netmask = GetMasterInfo() |
|
| 420 | 424 |
if old_netmask == netmask: |
| 421 | 425 |
return |
| 422 | 426 |
|
| b/lib/cmdlib.py | ||
|---|---|---|
| 3710 | 3710 |
self.cluster.master_netdev = self.op.master_netdev |
| 3711 | 3711 |
|
| 3712 | 3712 |
if self.op.master_netmask: |
| 3713 |
master = self.cfg.GetMasterNode()
|
|
| 3713 |
(master, ip, dev, old_netmask, _) = self.cfg.GetMasterNetworkParameters()
|
|
| 3714 | 3714 |
feedback_fn("Changing master IP netmask to %s" % self.op.master_netmask)
|
| 3715 |
result = self.rpc.call_node_change_master_netmask(master, |
|
| 3716 |
self.op.master_netmask) |
|
| 3715 |
result = self.rpc.call_node_change_master_netmask(master, old_netmask, |
|
| 3716 |
self.op.master_netmask, |
|
| 3717 |
ip, dev) |
|
| 3717 | 3718 |
if result.fail_msg: |
| 3718 | 3719 |
msg = "Could not change the master IP netmask: %s" % result.fail_msg |
| 3719 | 3720 |
self.LogWarning(msg) |
| b/lib/rpc_defs.py | ||
|---|---|---|
| 414 | 414 |
], None, |
| 415 | 415 |
"Deactivates master IP on a node"), |
| 416 | 416 |
("node_change_master_netmask", SINGLE, TMO_FAST, [
|
| 417 |
("netmask", None, None),
|
|
| 417 |
("old_netmask", None, "The old value of the netmask"),
|
|
| 418 |
("netmask", None, "The new value of the netmask"),
|
|
| 419 |
("master_ip", None, "The master IP"),
|
|
| 420 |
("master_netdev", None, "The master network device"),
|
|
| 418 | 421 |
], None, "Change master IP netmask"), |
| 419 | 422 |
("node_leave_cluster", SINGLE, TMO_NORMAL, [
|
| 420 | 423 |
("modify_ssh_setup", None, None),
|
| b/lib/server/noded.py | ||
|---|---|---|
| 718 | 718 |
"""Change the master IP netmask. |
| 719 | 719 |
|
| 720 | 720 |
""" |
| 721 |
return backend.ChangeMasterNetmask(params[0]) |
|
| 721 |
return backend.ChangeMasterNetmask(params[0], params[1], params[2], |
|
| 722 |
params[3]) |
|
| 722 | 723 |
|
| 723 | 724 |
@staticmethod |
| 724 | 725 |
def perspective_node_leave_cluster(params): |
Also available in: Unified diff