Revision 6bb43023
| b/lib/cmdlib/common.py | ||
|---|---|---|
| 194 | 194 |
""" |
| 195 | 195 |
# Gather target nodes |
| 196 | 196 |
cluster = lu.cfg.GetClusterInfo() |
| 197 |
master_info = lu.cfg.GetNodeInfo(lu.cfg.GetMasterNode())
|
|
| 197 |
master_info = lu.cfg.GetMasterNodeInfo()
|
|
| 198 | 198 |
|
| 199 | 199 |
online_node_uuids = lu.cfg.GetOnlineNodeList() |
| 200 | 200 |
online_node_uuid_set = frozenset(online_node_uuids) |
| b/lib/cmdlib/node.py | ||
|---|---|---|
| 217 | 217 |
|
| 218 | 218 |
# check that the type of the node (single versus dual homed) is the |
| 219 | 219 |
# same as for the master |
| 220 |
myself = self.cfg.GetNodeInfo(self.cfg.GetMasterNode())
|
|
| 220 |
myself = self.cfg.GetMasterNodeInfo()
|
|
| 221 | 221 |
master_singlehomed = myself.secondary_ip == myself.primary_ip |
| 222 | 222 |
newbie_singlehomed = secondary_ip == self.op.primary_ip |
| 223 | 223 |
if master_singlehomed != newbie_singlehomed: |
| ... | ... | |
| 635 | 635 |
# restrictions. |
| 636 | 636 |
if self.op.secondary_ip: |
| 637 | 637 |
# Ok even without locking, because this can't be changed by any LU |
| 638 |
master = self.cfg.GetNodeInfo(self.cfg.GetMasterNode())
|
|
| 638 |
master = self.cfg.GetMasterNodeInfo()
|
|
| 639 | 639 |
master_singlehomed = master.secondary_ip == master.primary_ip |
| 640 | 640 |
if master_singlehomed and self.op.secondary_ip != node.primary_ip: |
| 641 | 641 |
if self.op.force and node.uuid == master.uuid: |
Also available in: Unified diff