Revision 53919782

b/lib/cli.py
54 54
  "BACKEND_OPT",
55 55
  "BLK_OS_OPT",
56 56
  "CAPAB_MASTER_OPT",
57
  "CAPAB_VM_OPT",
57 58
  "CLEANUP_OPT",
58 59
  "CLUSTER_DOMAIN_SECRET_OPT",
59 60
  "CONFIRM_OPT",
......
875 876
                    type="bool", default=None, metavar=_YORNO,
876 877
                    help="Set the master_capable flag on the node")
877 878

  
879
CAPAB_VM_OPT = cli_option("--vm-capable", dest="vm_capable",
880
                    type="bool", default=None, metavar=_YORNO,
881
                    help="Set the vm_capable flag on the node")
882

  
878 883
ALLOCATABLE_OPT = cli_option("--allocatable", dest="allocatable",
879 884
                             type="bool", default=None, metavar=_YORNO,
880 885
                             help="Set the allocatable flag on a volume")
b/lib/client/gnt_node.py
649 649
  @return: the desired exit code
650 650

  
651 651
  """
652
  if [opts.master_candidate, opts.drained, opts.offline].count(None) == 3:
652
  all_changes = [opts.master_candidate, opts.drained, opts.offline,
653
                 opts.master_capable, opts.vm_capable]
654
  if all_changes.count(None) == len(all_changes):
653 655
    ToStderr("Please give at least one of the parameters.")
654 656
    return 1
655 657

  
......
658 660
                               offline=opts.offline,
659 661
                               drained=opts.drained,
660 662
                               master_capable=opts.master_capable,
663
                               vm_capable=opts.vm_capable,
661 664
                               force=opts.force,
662 665
                               auto_promote=opts.auto_promote)
663 666

  
......
709 712
    (utils.CommaJoin(_LIST_HEADERS), utils.CommaJoin(_LIST_DEF_FIELDS))),
710 713
  'modify': (
711 714
    SetNodeParams, ARGS_ONE_NODE,
712
    [FORCE_OPT, SUBMIT_OPT, MC_OPT, DRAINED_OPT, OFFLINE_OPT, CAPAB_MASTER_OPT,
715
    [FORCE_OPT, SUBMIT_OPT, MC_OPT, DRAINED_OPT, OFFLINE_OPT,
716
     CAPAB_MASTER_OPT, CAPAB_VM_OPT,
713 717
     AUTO_PROMOTE_OPT, DRY_RUN_OPT, PRIORITY_OPT],
714 718
    "<node_name>", "Alters the parameters of a node"),
715 719
  'powercycle': (
b/man/gnt-node.sgml
627 627
        <arg>--drained=<option>yes|no</option></arg>
628 628
        <arg>--offline=<option>yes|no</option></arg>
629 629
        <arg>--master-capable=<option>yes|no</option></arg>
630
        <arg>--vm-capable=<option>yes|no</option></arg>
630 631
        <arg>--auto-promote</arg>
631 632
        <arg choice="req"><replaceable>node</replaceable></arg>
632 633
      </cmdsynopsis>

Also available in: Unified diff