Revision 25be0c75

b/lib/cli.py
947 947

  
948 948
MASTER_NETDEV_OPT = cli_option("--master-netdev", dest="master_netdev",
949 949
                               help="Specify the node interface (cluster-wide)"
950
                               " on which the master IP address will be added "
951
                               " [%s]" % constants.DEFAULT_BRIDGE,
950
                               " on which the master IP address will be added"
951
                               " (cluster init default: %s)" %
952
                               constants.DEFAULT_BRIDGE,
952 953
                               metavar="NETDEV",
953
                               default=constants.DEFAULT_BRIDGE)
954
                               default=None)
954 955

  
955 956
GLOBAL_FILEDIR_OPT = cli_option("--file-storage-dir", dest="file_storage_dir",
956 957
                                help="Specify the default directory (cluster-"
b/lib/client/gnt_cluster.py
70 70
  if opts.drbd_storage and not opts.drbd_helper:
71 71
    drbd_helper = constants.DEFAULT_DRBD_HELPER
72 72

  
73
  master_netdev = opts.master_netdev
74
  if master_netdev is None:
75
    master_netdev = constants.DEFAULT_BRIDGE
76

  
73 77
  hvlist = opts.enabled_hypervisors
74 78
  if hvlist is None:
75 79
    hvlist = constants.DEFAULT_ENABLED_HYPERVISOR
......
124 128
                        secondary_ip=opts.secondary_ip,
125 129
                        vg_name=vg_name,
126 130
                        mac_prefix=opts.mac_prefix,
127
                        master_netdev=opts.master_netdev,
131
                        master_netdev=master_netdev,
128 132
                        file_storage_dir=opts.file_storage_dir,
129 133
                        enabled_hypervisors=hvlist,
130 134
                        hvparams=hvparams,

Also available in: Unified diff