Revision 8e47b5da
b/lib/client/gnt_group.py | ||
---|---|---|
130 | 130 |
@return: the desired exit code |
131 | 131 |
|
132 | 132 |
""" |
133 |
all_changes = { |
|
134 |
"ndparams": opts.ndparams, |
|
135 |
"alloc_policy": opts.alloc_policy, |
|
136 |
} |
|
137 |
|
|
138 |
if all_changes.values().count(None) == len(all_changes): |
|
133 |
if opts.ndparams is None and opts.alloc_policy is None: |
|
139 | 134 |
ToStderr("Please give at least one of the parameters.") |
140 | 135 |
return 1 |
141 | 136 |
|
142 |
op = opcodes.OpGroupSetParams(group_name=args[0], # pylint: disable-msg=W0142 |
|
143 |
**all_changes) |
|
137 |
op = opcodes.OpGroupSetParams(group_name=args[0], |
|
138 |
ndparams=opts.ndparams, |
|
139 |
alloc_policy=opts.alloc_policy) |
|
144 | 140 |
result = SubmitOrSend(op, opts) |
145 | 141 |
|
146 | 142 |
if result: |
b/lib/cmdlib.py | ||
---|---|---|
9831 | 9831 |
""" |
9832 | 9832 |
steps_total = 6 |
9833 | 9833 |
|
9834 |
pnode = self.instance.primary_node |
|
9835 |
|
|
9834 | 9836 |
# Step: check device activation |
9835 | 9837 |
self.lu.LogStep(1, steps_total, "Check device existence") |
9836 | 9838 |
self._CheckDisksExistence([self.instance.primary_node]) |
... | ... | |
9905 | 9907 |
" soon as possible")) |
9906 | 9908 |
|
9907 | 9909 |
self.lu.LogInfo("Detaching primary drbds from the network (=> standalone)") |
9908 |
result = self.rpc.call_drbd_disconnect_net([self.instance.primary_node], |
|
9909 |
self.node_secondary_ip, |
|
9910 |
self.instance.disks)\ |
|
9911 |
[self.instance.primary_node] |
|
9910 |
result = self.rpc.call_drbd_disconnect_net([pnode], self.node_secondary_ip, |
|
9911 |
self.instance.disks)[pnode] |
|
9912 | 9912 |
|
9913 | 9913 |
msg = result.fail_msg |
9914 | 9914 |
if msg: |
Also available in: Unified diff