Revision fdad8c4d scripts/gnt-cluster

b/scripts/gnt-cluster
603 603
          opts.beparams or opts.nicparams or
604 604
          opts.candidate_pool_size is not None or
605 605
          opts.uid_pool is not None or
606
          opts.maintain_node_health is not None):
606
          opts.maintain_node_health is not None or
607
          opts.add_uids is not None or
608
          opts.remove_uids is not None):
607 609
    ToStderr("Please give at least one of the parameters.")
608 610
    return 1
609 611

  
......
637 639
  if uid_pool is not None:
638 640
    uid_pool = uidpool.ParseUidPool(uid_pool)
639 641

  
642
  add_uids = opts.add_uids
643
  if add_uids is not None:
644
    add_uids = uidpool.ParseUidPool(add_uids)
645

  
646
  remove_uids = opts.remove_uids
647
  if remove_uids is not None:
648
    remove_uids = uidpool.ParseUidPool(remove_uids)
649

  
640 650
  op = opcodes.OpSetClusterParams(vg_name=vg_name,
641 651
                                  enabled_hypervisors=hvlist,
642 652
                                  hvparams=hvparams,
......
645 655
                                  nicparams=nicparams,
646 656
                                  candidate_pool_size=opts.candidate_pool_size,
647 657
                                  maintain_node_health=mnh,
648
                                  uid_pool=uid_pool)
658
                                  uid_pool=uid_pool,
659
                                  add_uids=add_uids,
660
                                  remove_uids=remove_uids)
649 661
  SubmitOpCode(op, opts=opts)
650 662
  return 0
651 663

  
......
797 809
    SetClusterParams, ARGS_NONE,
798 810
    [BACKEND_OPT, CP_SIZE_OPT, ENABLED_HV_OPT, HVLIST_OPT,
799 811
     NIC_PARAMS_OPT, NOLVM_STORAGE_OPT, VG_NAME_OPT, MAINTAIN_NODE_HEALTH_OPT,
800
     UIDPOOL_OPT],
812
     UIDPOOL_OPT, ADD_UIDS_OPT, REMOVE_UIDS_OPT],
801 813
    "[opts...]",
802 814
    "Alters the parameters of the cluster"),
803 815
  "renew-crypto": (

Also available in: Unified diff