Revision 5fbbd028 lib/cmdlib.py

b/lib/cmdlib.py
3668 3668
    ("primary_ip", None, _NoType),
3669 3669
    ("secondary_ip", None, _TMaybeString),
3670 3670
    ("readd", False, _TBool),
3671
    ("nodegroup", None, _TMaybeString)
3671 3672
    ]
3672 3673

  
3673 3674
  def CheckArguments(self):
......
3676 3677
    self.hostname = netutils.GetHostname(name=self.op.node_name,
3677 3678
                                         family=self.primary_ip_family)
3678 3679
    self.op.node_name = self.hostname.name
3680
    if self.op.readd and self.op.nodegroup:
3681
      raise errors.OpPrereqError("Cannot pass a nodegroup when a node is"
3682
                                 " being readded", errors.ECODE_INVAL)
3679 3683

  
3680 3684
  def BuildHooksEnv(self):
3681 3685
    """Build hooks env.
......
3790 3794
      self.new_node = self.cfg.GetNodeInfo(node)
3791 3795
      assert self.new_node is not None, "Can't retrieve locked node %s" % node
3792 3796
    else:
3793
      # TODO: process an arbitrary non-default nodegroup
3794
      nodegroup = cfg.LookupNodeGroup(None)
3797
      nodegroup = cfg.LookupNodeGroup(self.op.nodegroup)
3795 3798
      self.new_node = objects.Node(name=node,
3796 3799
                                   primary_ip=primary_ip,
3797 3800
                                   secondary_ip=secondary_ip,

Also available in: Unified diff