Revision 38f9d2cf lib/cmdlib.py
| b/lib/cmdlib.py | ||
|---|---|---|
| 2703 | 2703 |
("ndparams", None, ht.TOr(ht.TDict, ht.TNone)),
|
| 2704 | 2704 |
("drbd_helper", None, ht.TOr(ht.TString, ht.TNone)),
|
| 2705 | 2705 |
("default_iallocator", None, ht.TOr(ht.TString, ht.TNone)),
|
| 2706 |
("master_netdev", None, ht.TOr(ht.TString, ht.TNone)),
|
|
| 2706 | 2707 |
("reserved_lvs", None, ht.TOr(ht.TListOf(ht.TNonEmptyString), ht.TNone)),
|
| 2707 | 2708 |
("hidden_os", None, ht.TOr(ht.TListOf(\
|
| 2708 | 2709 |
ht.TAnd(ht.TList, |
| ... | ... | |
| 3019 | 3020 |
if self.op.blacklisted_os: |
| 3020 | 3021 |
helper_os("blacklisted_os", self.op.blacklisted_os, "blacklisted")
|
| 3021 | 3022 |
|
| 3023 |
if self.op.master_netdev: |
|
| 3024 |
master = self.cfg.GetMasterNode() |
|
| 3025 |
feedback_fn("Shutting down master ip on the current netdev (%s)" %
|
|
| 3026 |
self.cluster.master_netdev) |
|
| 3027 |
result = self.rpc.call_node_stop_master(master, False) |
|
| 3028 |
result.Raise("Could not disable the master ip")
|
|
| 3029 |
feedback_fn("Changing master_netdev from %s to %s" %
|
|
| 3030 |
(self.cluster.master_netdev, self.op.master_netdev)) |
|
| 3031 |
self.cluster.master_netdev = self.op.master_netdev |
|
| 3032 |
|
|
| 3022 | 3033 |
self.cfg.Update(self.cluster, feedback_fn) |
| 3023 | 3034 |
|
| 3035 |
if self.op.master_netdev: |
|
| 3036 |
feedback_fn("Starting the master ip on the new master netdev (%s)" %
|
|
| 3037 |
self.op.master_netdev) |
|
| 3038 |
result = self.rpc.call_node_start_master(master, False, False) |
|
| 3039 |
if result.fail_msg: |
|
| 3040 |
self.LogWarning("Could not re-enable the master ip on"
|
|
| 3041 |
" the master, please restart manually: %s", |
|
| 3042 |
result.fail_msg) |
|
| 3043 |
|
|
| 3024 | 3044 |
|
| 3025 | 3045 |
def _UploadHelper(lu, nodes, fname): |
| 3026 | 3046 |
"""Helper for uploading a file and showing warnings. |
Also available in: Unified diff