Revision e5370111 lib/cmdlib/instance.py
b/lib/cmdlib/instance.py | ||
---|---|---|
1041 | 1041 |
self.LogInfo("Chose IP %s from network %s", nic.ip, nobj.name) |
1042 | 1042 |
else: |
1043 | 1043 |
try: |
1044 |
self.cfg.ReserveIp(net_uuid, nic.ip, self.proc.GetECId()) |
|
1044 |
self.cfg.ReserveIp(net_uuid, nic.ip, self.proc.GetECId(), |
|
1045 |
check=self.op.conflicts_check) |
|
1045 | 1046 |
except errors.ReservationError: |
1046 | 1047 |
raise errors.OpPrereqError("IP address %s already in use" |
1047 | 1048 |
" or does not belong to network %s" % |
... | ... | |
2586 | 2587 |
# Reserve new IP if in the new network if any |
2587 | 2588 |
elif new_net_uuid: |
2588 | 2589 |
try: |
2589 |
self.cfg.ReserveIp(new_net_uuid, new_ip, self.proc.GetECId()) |
|
2590 |
self.cfg.ReserveIp(new_net_uuid, new_ip, self.proc.GetECId(), |
|
2591 |
check=self.op.conflicts_check) |
|
2590 | 2592 |
self.LogInfo("Reserving IP %s in network %s", |
2591 | 2593 |
new_ip, new_net_obj.name) |
2592 | 2594 |
except errors.ReservationError: |
Also available in: Unified diff