Revision ce735215

b/lib/bootstrap.py
97 97

  
98 98

  
99 99
def InitCluster(cluster_name, mac_prefix, def_bridge,
100
                master_netdev, file_storage_dir,
101
                secondary_ip=None,
102
                vg_name=None, beparams=None, hvparams=None,
100
                master_netdev, file_storage_dir, candidate_pool_size,
101
                secondary_ip=None, vg_name=None, beparams=None, hvparams=None,
103 102
                enabled_hypervisors=None, default_hypervisor=None):
104 103
  """Initialise the cluster.
105 104

  
105
  @type candidate_pool_size: int
106
  @param candidate_pool_size: master candidate pool size
107

  
106 108
  """
109
  # TODO: complete the docstring
107 110
  if config.ConfigWriter.IsCluster():
108 111
    raise errors.OpPrereqError("Cluster is already initialised")
109 112

  
......
211 214
    default_hypervisor=default_hypervisor,
212 215
    beparams={constants.BEGR_DEFAULT: beparams},
213 216
    hvparams=hvparams,
217
    candidate_pool_size=candidate_pool_size,
214 218
    )
215 219
  master_node_config = objects.Node(name=hostname.name,
216 220
                                    primary_ip=hostname.ip,
b/scripts/gnt-cluster
123 123
                        enabled_hypervisors=hvlist,
124 124
                        default_hypervisor=opts.default_hypervisor,
125 125
                        hvparams=hvparams,
126
                        beparams=beparams)
126
                        beparams=beparams,
127
                        candidate_pool_size=opts.candidate_pool_size,
128
                        )
127 129
  return 0
128 130

  
129 131

  
......
570 572
            keyval_option("-B", "--backend-parameters", dest="beparams",
571 573
                          type="keyval", default={},
572 574
                          help="Backend parameters"),
575
            make_option("-C", "--candidate-pool-size",
576
                        default=constants.MASTER_POOL_SIZE_DEFAULT,
577
                        help="Set the candidate pool size",
578
                        dest="candidate_pool_size", type="int"),
573 579
            ],
574 580
           "[opts...] <cluster_name>",
575 581
           "Initialises a new cluster configuration"),

Also available in: Unified diff