Revision b6a30b0d lib/bootstrap.py

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,

Also available in: Unified diff