Revision bf33c5fa lib/cmdlib/instance.py

b/lib/cmdlib/instance.py
1000 1000
            self.LogInfo("Chose IP %s from network %s", nic.ip, nobj.name)
1001 1001
          else:
1002 1002
            try:
1003
              self.cfg.ReserveIp(net_uuid, nic.ip, self.proc.GetECId())
1003
              self.cfg.ReserveIp(net_uuid, nic.ip, self.proc.GetECId(),
1004
                                 check=self.op.conflicts_check)
1004 1005
            except errors.ReservationError:
1005 1006
              raise errors.OpPrereqError("IP address %s already in use"
1006 1007
                                         " or does not belong to network %s" %
......
2535 2536
        # Reserve new IP if in the new network if any
2536 2537
        elif new_net_uuid:
2537 2538
          try:
2538
            self.cfg.ReserveIp(new_net_uuid, new_ip, self.proc.GetECId())
2539
            self.cfg.ReserveIp(new_net_uuid, new_ip, self.proc.GetECId(),
2540
                               check=self.op.conflicts_check)
2539 2541
            self.LogInfo("Reserving IP %s in network %s",
2540 2542
                         new_ip, new_net_obj.name)
2541 2543
          except errors.ReservationError:

Also available in: Unified diff