Revision 39b0f0c2

b/lib/bootstrap.py
236 236
                secondary_ip=None, vg_name=None, beparams=None,
237 237
                nicparams=None, hvparams=None, enabled_hypervisors=None,
238 238
                modify_etc_hosts=True, modify_ssh_setup=True,
239
                maintain_node_health=False):
239
                maintain_node_health=False,
240
                uid_pool=None):
240 241
  """Initialise the cluster.
241 242

  
242 243
  @type candidate_pool_size: int
......
359 360
    candidate_pool_size=candidate_pool_size,
360 361
    modify_etc_hosts=modify_etc_hosts,
361 362
    modify_ssh_setup=modify_ssh_setup,
363
    uid_pool=uid_pool,
362 364
    ctime=now,
363 365
    mtime=now,
364 366
    uuid=utils.NewUUID(),
b/scripts/gnt-cluster
92 92
  if opts.mac_prefix is None:
93 93
    opts.mac_prefix = constants.DEFAULT_MAC_PREFIX
94 94

  
95
  uid_pool = opts.uid_pool
96
  if uid_pool is not None:
97
    uid_pool = uidpool.ParseUidPool(uid_pool)
98

  
95 99
  bootstrap.InitCluster(cluster_name=args[0],
96 100
                        secondary_ip=opts.secondary_ip,
97 101
                        vg_name=vg_name,
......
106 110
                        modify_etc_hosts=opts.modify_etc_hosts,
107 111
                        modify_ssh_setup=opts.modify_ssh_setup,
108 112
                        maintain_node_health=opts.maintain_node_health,
113
                        uid_pool=uid_pool,
109 114
                        )
110 115
  op = opcodes.OpPostInitCluster()
111 116
  SubmitOpCode(op, opts=opts)
......
740 745
    [BACKEND_OPT, CP_SIZE_OPT, ENABLED_HV_OPT, GLOBAL_FILEDIR_OPT,
741 746
     HVLIST_OPT, MAC_PREFIX_OPT, MASTER_NETDEV_OPT, NIC_PARAMS_OPT,
742 747
     NOLVM_STORAGE_OPT, NOMODIFY_ETCHOSTS_OPT, NOMODIFY_SSH_SETUP_OPT,
743
     SECONDARY_IP_OPT, VG_NAME_OPT, MAINTAIN_NODE_HEALTH_OPT],
748
     SECONDARY_IP_OPT, VG_NAME_OPT, MAINTAIN_NODE_HEALTH_OPT,
749
     UIDPOOL_OPT],
744 750
    "[opts...] <cluster_name>", "Initialises a new cluster configuration"),
745 751
  'destroy': (
746 752
    DestroyCluster, ARGS_NONE, [YES_DOIT_OPT],

Also available in: Unified diff