Revision bc5d0215 lib/bootstrap.py
b/lib/bootstrap.py | ||
---|---|---|
286 | 286 |
master_netmask, master_netdev, file_storage_dir, |
287 | 287 |
shared_file_storage_dir, candidate_pool_size, secondary_ip=None, |
288 | 288 |
vg_name=None, beparams=None, nicparams=None, ndparams=None, |
289 |
hvparams=None, enabled_hypervisors=None, modify_etc_hosts=True,
|
|
290 |
modify_ssh_setup=True, maintain_node_health=False,
|
|
291 |
drbd_helper=None, uid_pool=None, default_iallocator=None,
|
|
292 |
primary_ip_version=None, prealloc_wipe_disks=False,
|
|
293 |
use_external_mip_script=False): |
|
289 |
hvparams=None, diskparams=None, enabled_hypervisors=None,
|
|
290 |
modify_etc_hosts=True, modify_ssh_setup=True,
|
|
291 |
maintain_node_health=False, drbd_helper=None, uid_pool=None,
|
|
292 |
default_iallocator=None, primary_ip_version=None,
|
|
293 |
prealloc_wipe_disks=False, use_external_mip_script=False):
|
|
294 | 294 |
"""Initialise the cluster. |
295 | 295 |
|
296 | 296 |
@type candidate_pool_size: int |
... | ... | |
426 | 426 |
hv_class = hypervisor.GetHypervisor(hv_name) |
427 | 427 |
hv_class.CheckParameterSyntax(hv_params) |
428 | 428 |
|
429 |
# diskparams is a mapping of disk-template->diskparams dict |
|
430 |
for template, dt_params in diskparams.items(): |
|
431 |
param_keys = set(dt_params.keys()) |
|
432 |
default_param_keys = set(constants.DISK_DT_DEFAULTS[template].keys()) |
|
433 |
if not (param_keys <= default_param_keys): |
|
434 |
unknown_params = param_keys - default_param_keys |
|
435 |
raise errors.OpPrereqError("Invalid parameters for disk template %s:" |
|
436 |
" %s" % (template, |
|
437 |
utils.CommaJoin(unknown_params))) |
|
438 |
utils.ForceDictType(dt_params, constants.DISK_DT_TYPES) |
|
439 |
|
|
429 | 440 |
# set up ssh config and /etc/hosts |
430 | 441 |
sshline = utils.ReadFile(constants.SSH_HOST_RSA_PUB) |
431 | 442 |
sshkey = sshline.split(" ")[1] |
... | ... | |
473 | 484 |
nicparams={constants.PP_DEFAULT: nicparams}, |
474 | 485 |
ndparams=ndparams, |
475 | 486 |
hvparams=hvparams, |
487 |
diskparams=diskparams, |
|
476 | 488 |
candidate_pool_size=candidate_pool_size, |
477 | 489 |
modify_etc_hosts=modify_etc_hosts, |
478 | 490 |
modify_ssh_setup=modify_ssh_setup, |
... | ... | |
542 | 554 |
uuid=uuid_generator.Generate([], utils.NewUUID, _INITCONF_ECID), |
543 | 555 |
name=constants.INITIAL_NODE_GROUP_NAME, |
544 | 556 |
members=[master_node_config.name], |
557 |
diskparams=cluster_config.diskparams, |
|
545 | 558 |
) |
546 | 559 |
nodegroups = { |
547 | 560 |
default_nodegroup.uuid: default_nodegroup, |
Also available in: Unified diff