(result.cmd, result.exit_code, result.output))
-def InitCluster(cluster_name, mac_prefix, def_bridge,
+def InitCluster(cluster_name, mac_prefix,
master_netdev, file_storage_dir, candidate_pool_size,
- secondary_ip=None, vg_name=None, beparams=None, hvparams=None,
- enabled_hypervisors=None, default_hypervisor=None,
- modify_etc_hosts=True):
+ secondary_ip=None, vg_name=None, beparams=None,
+ nicparams=None, hvparams=None, enabled_hypervisors=None,
+ default_hypervisor=None, modify_etc_hosts=True):
"""Initialise the cluster.
@type candidate_pool_size: int
utils.EnsureDirs(dirs)
utils.ForceDictType(beparams, constants.BES_PARAMETER_TYPES)
+ utils.ForceDictType(nicparams, constants.NICS_PARAMETER_TYPES)
+ objects.NIC.CheckParameterSyntax(nicparams)
+
# hvparams is a mapping of hypervisor->hvparams dict
for hv_name, hv_params in hvparams.iteritems():
utils.ForceDictType(hv_params, constants.HVS_PARAMETER_TYPES)
highest_used_port=(constants.FIRST_DRBD_PORT - 1),
mac_prefix=mac_prefix,
volume_group_name=vg_name,
- default_bridge=def_bridge,
tcpudp_port_pool=set(),
master_node=hostname.name,
master_ip=clustername.ip,
file_storage_dir=file_storage_dir,
enabled_hypervisors=enabled_hypervisors,
default_hypervisor=default_hypervisor,
- beparams={constants.BEGR_DEFAULT: beparams},
+ beparams={constants.PP_DEFAULT: beparams},
+ nicparams={constants.PP_DEFAULT: nicparams},
hvparams=hvparams,
candidate_pool_size=candidate_pool_size,
- modify_etc_hosts=opts.modify_etc_hosts,
+ modify_etc_hosts=modify_etc_hosts,
)
master_node_config = objects.Node(name=hostname.name,
primary_ip=hostname.ip,