Commit ec0652ad authored by Guido Trotter's avatar Guido Trotter

InitCluster: don't set default_bridge

And remove the -b option, as default nic parameters can be used instead.
We could support the option, but that would add more code, and since
cluster init is not a frequent operation, it's better to keep the code
clean.
Signed-off-by: default avatarGuido Trotter <ultrotter@google.com>
Reviewed-by: default avatarIustin Pop <iustin@google.com>
parent b165e77e
......@@ -120,7 +120,7 @@ def _InitGanetiServerSetup():
(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,
nicparams=None, hvparams=None, enabled_hypervisors=None,
......@@ -241,7 +241,6 @@ def InitCluster(cluster_name, mac_prefix, def_bridge,
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,
......
......@@ -98,7 +98,6 @@ def InitCluster(opts, args):
secondary_ip=opts.secondary_ip,
vg_name=vg_name,
mac_prefix=opts.mac_prefix,
def_bridge=opts.def_bridge,
master_netdev=opts.master_netdev,
file_storage_dir=opts.file_storage_dir,
enabled_hypervisors=hvlist,
......@@ -554,12 +553,6 @@ commands = {
" (cluster-wide) for disk allocation [xenvg]",
metavar="VG",
default=None,),
make_option("-b", "--bridge", dest="def_bridge",
help="Specify the default bridge name (cluster-wide)"
" to connect the instances to [%s]" %
constants.DEFAULT_BRIDGE,
metavar="BRIDGE",
default=constants.DEFAULT_BRIDGE,),
make_option("--master-netdev", dest="master_netdev",
help="Specify the node interface (cluster-wide)"
" on which the master IP address will be added "
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment