Revision 877b849b lib/cmdlib.py

b/lib/cmdlib.py
5777 5777

  
5778 5778
    _CheckNodeOnline(self, target_node)
5779 5779
    _CheckNodeNotDrained(self, target_node)
5780
    _CheckNodeVmCapable(self, target_node)
5780 5781

  
5781 5782
    if instance.admin_up:
5782 5783
      # check memory requirements on the secondary node
......
7365 7366
    if pnode.drained:
7366 7367
      raise errors.OpPrereqError("Cannot use drained primary node '%s'" %
7367 7368
                                 pnode.name, errors.ECODE_STATE)
7369
    if not pnode.vm_capable:
7370
      raise errors.OpPrereqError("Cannot use non-vm_capable primary node"
7371
                                 " '%s'" % pnode.name, errors.ECODE_STATE)
7368 7372

  
7369 7373
    self.secondaries = []
7370 7374

  
......
7375 7379
                                   " primary node.", errors.ECODE_INVAL)
7376 7380
      _CheckNodeOnline(self, self.op.snode)
7377 7381
      _CheckNodeNotDrained(self, self.op.snode)
7382
      _CheckNodeVmCapable(self, self.op.snode)
7378 7383
      self.secondaries.append(self.op.snode)
7379 7384

  
7380 7385
    nodenames = [pnode.name] + self.secondaries
......
7956 7961
        check_nodes = [self.new_node, self.other_node]
7957 7962

  
7958 7963
        _CheckNodeNotDrained(self.lu, remote_node)
7964
        _CheckNodeVmCapable(self.lu, remote_node)
7959 7965

  
7960 7966
        old_node_info = self.cfg.GetNodeInfo(secondary_node)
7961 7967
        assert old_node_info is not None

Also available in: Unified diff