Revision 031d2db1 lib/cmdlib/instance.py

b/lib/cmdlib/instance.py
1035 1035 
            self.LogInfo("Chose IP %s from network %s", nic.ip, nobj.name)
1036 1036 
          else:
1037 1037 
            try:
1038 
              self.cfg.ReserveIp(net_uuid, nic.ip, self.proc.GetECId())
1038 
              self.cfg.ReserveIp(net_uuid, nic.ip, self.proc.GetECId(),
1039 
                                 check=self.op.conflicts_check)
1039 1040 
            except errors.ReservationError:
1040 1041 
              raise errors.OpPrereqError("IP address %s already in use"
1041 1042 
                                         " or does not belong to network %s" %
......
2620 2621 
        # Reserve new IP if in the new network if any
2621 2622 
        elif new_net_uuid:
2622 2623 
          try:
2623 
            self.cfg.ReserveIp(new_net_uuid, new_ip, self.proc.GetECId())
2624 
            self.cfg.ReserveIp(new_net_uuid, new_ip, self.proc.GetECId(),
2625 
                               check=self.op.conflicts_check)
2624 2626 
            self.LogInfo("Reserving IP %s in network %s",
2625 2627 
                         new_ip, new_net_obj.name)
2626 2628 
          except errors.ReservationError:

Also available in: Unified diff