Revision b6a30b0d
b/lib/bootstrap.py | ||
---|---|---|
122 | 122 |
|
123 | 123 |
def InitCluster(cluster_name, mac_prefix, def_bridge, |
124 | 124 |
master_netdev, file_storage_dir, candidate_pool_size, |
125 |
secondary_ip=None, vg_name=None, beparams=None, hvparams=None,
|
|
126 |
enabled_hypervisors=None, default_hypervisor=None,
|
|
127 |
modify_etc_hosts=True): |
|
125 |
secondary_ip=None, vg_name=None, beparams=None, |
|
126 |
nicparams=None, hvparams=None, enabled_hypervisors=None,
|
|
127 |
default_hypervisor=None, modify_etc_hosts=True):
|
|
128 | 128 |
"""Initialise the cluster. |
129 | 129 |
|
130 | 130 |
@type candidate_pool_size: int |
... | ... | |
209 | 209 |
utils.EnsureDirs(dirs) |
210 | 210 |
|
211 | 211 |
utils.ForceDictType(beparams, constants.BES_PARAMETER_TYPES) |
212 |
utils.ForceDictType(nicparams, constants.NICS_PARAMETER_TYPES) |
|
213 |
objects.NIC.CheckParameterSyntax(nicparams) |
|
214 |
|
|
212 | 215 |
# hvparams is a mapping of hypervisor->hvparams dict |
213 | 216 |
for hv_name, hv_params in hvparams.iteritems(): |
214 | 217 |
utils.ForceDictType(hv_params, constants.HVS_PARAMETER_TYPES) |
... | ... | |
248 | 251 |
enabled_hypervisors=enabled_hypervisors, |
249 | 252 |
default_hypervisor=default_hypervisor, |
250 | 253 |
beparams={constants.PP_DEFAULT: beparams}, |
254 |
nicparams={constants.PP_DEFAULT: nicparams}, |
|
251 | 255 |
hvparams=hvparams, |
252 | 256 |
candidate_pool_size=candidate_pool_size, |
253 | 257 |
modify_etc_hosts=modify_etc_hosts, |
b/scripts/gnt-cluster | ||
---|---|---|
72 | 72 |
|
73 | 73 |
hvparams = dict(opts.hvparams) |
74 | 74 |
beparams = opts.beparams |
75 |
nicparams = opts.nicparams |
|
75 | 76 |
|
76 | 77 |
# prepare beparams dict |
77 | 78 |
beparams = objects.FillDict(constants.BEC_DEFAULTS, beparams) |
78 | 79 |
utils.ForceDictType(beparams, constants.BES_PARAMETER_TYPES) |
79 | 80 |
|
81 |
# prepare nicparams dict |
|
82 |
nicparams = objects.FillDict(constants.NICC_DEFAULTS, nicparams) |
|
83 |
utils.ForceDictType(nicparams, constants.NICS_PARAMETER_TYPES) |
|
84 |
|
|
80 | 85 |
# prepare hvparams dict |
81 | 86 |
for hv in constants.HYPER_TYPES: |
82 | 87 |
if hv not in hvparams: |
... | ... | |
100 | 105 |
default_hypervisor=opts.default_hypervisor, |
101 | 106 |
hvparams=hvparams, |
102 | 107 |
beparams=beparams, |
108 |
nicparams=nicparams, |
|
103 | 109 |
candidate_pool_size=opts.candidate_pool_size, |
104 | 110 |
modify_etc_hosts=opts.modify_etc_hosts, |
105 | 111 |
) |
... | ... | |
579 | 585 |
keyval_option("-B", "--backend-parameters", dest="beparams", |
580 | 586 |
type="keyval", default={}, |
581 | 587 |
help="Backend parameters"), |
588 |
keyval_option("-N", "--nic-parameters", dest="nicparams", |
|
589 |
type="keyval", default={}, |
|
590 |
help="NIC parameters"), |
|
582 | 591 |
make_option("-C", "--candidate-pool-size", |
583 | 592 |
default=constants.MASTER_POOL_SIZE_DEFAULT, |
584 | 593 |
help="Set the candidate pool size", |
Also available in: Unified diff