Revision e7a77eb8 lib/cmdlib/instance.py

b/lib/cmdlib/instance.py
2675 2675
                                           self.op.disk_template))
2676 2676
        raise errors.OpPrereqError(errmsg, errors.ECODE_STATE)
2677 2677

  
2678
  # too many local variables
2679
  # pylint: disable=R0914
2678 2680
  def CheckPrereq(self):
2679 2681
    """Check prerequisites.
2680 2682

  
......
2756 2758
                                      constants.DT_EXT),
2757 2759
                                     errors.ECODE_INVAL)
2758 2760

  
2759
    if self.op.hotplug:
2761
    if self.op.hotplug or self.op.hotplug_if_possible:
2760 2762
      result = self.rpc.call_hotplug_supported(self.instance.primary_node,
2761 2763
                                               self.instance)
2762
      result.Raise("Hotplug is not supported.")
2764
      if result.fail_msg:
2765
        if self.op.hotplug:
2766
          result.Raise("Hotplug is not possible: %s" % result.fail_msg,
2767
                       prereq=True)
2768
        else:
2769
          self.LogWarning(result.fail_msg)
2770
          self.op.hotplug = False
2771
          self.LogInfo("Modification will take place without hotplugging.")
2772
      else:
2773
        self.op.hotplug = True
2763 2774

  
2764 2775
    # OS change
2765 2776
    if self.op.os_name and not self.op.force:

Also available in: Unified diff