diff --git a/lib/bootstrap.py b/lib/bootstrap.py index 24f9a0add22e2e5e6683874e5c831be29ade83e2..0da28bf24648d4f86fb0c449a0bf67b5f8d738bc 100644 --- a/lib/bootstrap.py +++ b/lib/bootstrap.py @@ -223,10 +223,10 @@ def _InitFileStorage(file_storage_dir): def InitCluster(cluster_name, mac_prefix, master_netdev, file_storage_dir, candidate_pool_size, secondary_ip=None, vg_name=None, beparams=None, - nicparams=None, hvparams=None, enabled_hypervisors=None, - modify_etc_hosts=True, modify_ssh_setup=True, - maintain_node_health=False, drbd_helper=None, - uid_pool=None, default_iallocator=None, + nicparams=None, ndparams=None, hvparams=None, + enabled_hypervisors=None, modify_etc_hosts=True, + modify_ssh_setup=True, maintain_node_health=False, + drbd_helper=None, uid_pool=None, default_iallocator=None, primary_ip_version=None, prealloc_wipe_disks=False): """Initialise the cluster. @@ -338,6 +338,7 @@ def InitCluster(cluster_name, mac_prefix, utils.ForceDictType(beparams, constants.BES_PARAMETER_TYPES) utils.ForceDictType(nicparams, constants.NICS_PARAMETER_TYPES) + utils.ForceDictType(ndparams, constants.NDS_PARAMETER_TYPES) objects.NIC.CheckParameterSyntax(nicparams) # hvparams is a mapping of hypervisor->hvparams dict @@ -383,6 +384,7 @@ def InitCluster(cluster_name, mac_prefix, enabled_hypervisors=enabled_hypervisors, beparams={constants.PP_DEFAULT: beparams}, nicparams={constants.PP_DEFAULT: nicparams}, + ndparams=ndparams, hvparams=hvparams, candidate_pool_size=candidate_pool_size, modify_etc_hosts=modify_etc_hosts,