Revision c7dd65be lib/cmdlib/cluster.py
| b/lib/cmdlib/cluster.py | ||
|---|---|---|
| 168 | 168 |
ems = self.cfg.GetUseExternalMipScript() |
| 169 | 169 |
result = self.rpc.call_node_deactivate_master_ip(master_params.name, |
| 170 | 170 |
master_params, ems) |
| 171 |
if result.fail_msg: |
|
| 172 |
self.LogWarning("Error disabling the master IP address: %s",
|
|
| 173 |
result.fail_msg) |
|
| 174 |
|
|
| 171 |
result.Warn("Error disabling the master IP address", self.LogWarning)
|
|
| 175 | 172 |
return master_params.name |
| 176 | 173 |
|
| 177 | 174 |
|
| ... | ... | |
| 430 | 427 |
master_params.ip = new_ip |
| 431 | 428 |
result = self.rpc.call_node_activate_master_ip(master_params.name, |
| 432 | 429 |
master_params, ems) |
| 433 |
msg = result.fail_msg |
|
| 434 |
if msg: |
|
| 435 |
self.LogWarning("Could not re-enable the master role on"
|
|
| 436 |
" the master, please restart manually: %s", msg) |
|
| 430 |
result.Warn("Could not re-enable the master role on the master,"
|
|
| 431 |
" please restart manually", self.LogWarning) |
|
| 437 | 432 |
|
| 438 | 433 |
return clustername |
| 439 | 434 |
|
| ... | ... | |
| 1115 | 1110 |
self.op.master_netmask, |
| 1116 | 1111 |
master_params.ip, |
| 1117 | 1112 |
master_params.netdev) |
| 1118 |
if result.fail_msg: |
|
| 1119 |
msg = "Could not change the master IP netmask: %s" % result.fail_msg |
|
| 1120 |
feedback_fn(msg) |
|
| 1121 |
|
|
| 1113 |
result.Warn("Could not change the master IP netmask", feedback_fn)
|
|
| 1122 | 1114 |
self.cluster.master_netmask = self.op.master_netmask |
| 1123 | 1115 |
|
| 1124 | 1116 |
self.cfg.Update(self.cluster, feedback_fn) |
| ... | ... | |
| 1130 | 1122 |
ems = self.cfg.GetUseExternalMipScript() |
| 1131 | 1123 |
result = self.rpc.call_node_activate_master_ip(master_params.name, |
| 1132 | 1124 |
master_params, ems) |
| 1133 |
if result.fail_msg: |
|
| 1134 |
self.LogWarning("Could not re-enable the master ip on"
|
|
| 1135 |
" the master, please restart manually: %s", |
|
| 1136 |
result.fail_msg) |
|
| 1125 |
result.Warn("Could not re-enable the master ip on the master,"
|
|
| 1126 |
" please restart manually", self.LogWarning) |
|
| 1137 | 1127 |
|
| 1138 | 1128 |
|
| 1139 | 1129 |
class LUClusterVerify(NoHooksLU): |
Also available in: Unified diff