Revision ec0652ad

b/lib/bootstrap.py
120 120
                             (result.cmd, result.exit_code, result.output))
121 121

  
122 122

  
123
def InitCluster(cluster_name, mac_prefix, def_bridge,
123
def InitCluster(cluster_name, mac_prefix,
124 124
                master_netdev, file_storage_dir, candidate_pool_size,
125 125
                secondary_ip=None, vg_name=None, beparams=None,
126 126
                nicparams=None, hvparams=None, enabled_hypervisors=None,
......
241 241
    highest_used_port=(constants.FIRST_DRBD_PORT - 1),
242 242
    mac_prefix=mac_prefix,
243 243
    volume_group_name=vg_name,
244
    default_bridge=def_bridge,
245 244
    tcpudp_port_pool=set(),
246 245
    master_node=hostname.name,
247 246
    master_ip=clustername.ip,
b/scripts/gnt-cluster
98 98
                        secondary_ip=opts.secondary_ip,
99 99
                        vg_name=vg_name,
100 100
                        mac_prefix=opts.mac_prefix,
101
                        def_bridge=opts.def_bridge,
102 101
                        master_netdev=opts.master_netdev,
103 102
                        file_storage_dir=opts.file_storage_dir,
104 103
                        enabled_hypervisors=hvlist,
......
554 553
                        " (cluster-wide) for disk allocation [xenvg]",
555 554
                        metavar="VG",
556 555
                        default=None,),
557
            make_option("-b", "--bridge", dest="def_bridge",
558
                        help="Specify the default bridge name (cluster-wide)"
559
                          " to connect the instances to [%s]" %
560
                          constants.DEFAULT_BRIDGE,
561
                        metavar="BRIDGE",
562
                        default=constants.DEFAULT_BRIDGE,),
563 556
            make_option("--master-netdev", dest="master_netdev",
564 557
                        help="Specify the node interface (cluster-wide)"
565 558
                          " on which the master IP address will be added "

Also available in: Unified diff