Revision 402df383 lib/cmdlib/network.py
| b/lib/cmdlib/network.py | ||
|---|---|---|
| 168 | 168 |
if self.op.conflicts_check: |
| 169 | 169 |
for node in self.cfg.GetAllNodesInfo().values(): |
| 170 | 170 |
for ip in [node.primary_ip, node.secondary_ip]: |
| 171 |
try: |
|
| 172 |
if self.pool.Contains(ip): |
|
| 173 |
self.pool.Reserve(ip, True) |
|
| 174 |
self.LogInfo("Reserved IP address of node '%s' (%s)",
|
|
| 175 |
node.name, ip) |
|
| 176 |
except errors.AddressPoolError, err: |
|
| 177 |
self.LogWarning("Cannot reserve IP address '%s' of node '%s': %s",
|
|
| 178 |
ip, node.name, err) |
|
| 171 |
if self.pool.Contains(ip): |
|
| 172 |
self.pool.Reserve(ip, True) |
|
| 173 |
self.LogInfo("Reserved IP address of node '%s' (%s)", node.name, ip)
|
|
| 179 | 174 |
|
| 180 | 175 |
master_ip = self.cfg.GetClusterInfo().master_ip |
| 181 |
try: |
|
| 182 |
if self.pool.Contains(master_ip): |
|
| 183 |
self.pool.Reserve(master_ip, True) |
|
| 184 |
self.LogInfo("Reserved cluster master IP address (%s)", master_ip)
|
|
| 185 |
except errors.AddressPoolError, err: |
|
| 186 |
self.LogWarning("Cannot reserve cluster master IP address (%s): %s",
|
|
| 187 |
master_ip, err) |
|
| 176 |
if self.pool.Contains(master_ip): |
|
| 177 |
self.pool.Reserve(master_ip, True) |
|
| 178 |
self.LogInfo("Reserved cluster master IP address (%s)", master_ip)
|
|
| 188 | 179 |
|
| 189 | 180 |
if self.op.add_reserved_ips: |
| 190 | 181 |
for ip in self.op.add_reserved_ips: |
Also available in: Unified diff