Revision 90017904

b/lib/client/gnt_cluster.py
121 121

  
122 122
  master_netdev = opts.master_netdev
123 123
  if master_netdev is None:
124
    master_netdev = constants.DEFAULT_BRIDGE
124
    if not opts.nicparams[constants.NIC_MODE]:
125
      # default case, use bridging
126
      master_netdev = constants.DEFAULT_BRIDGE
127
    elif opts.nicparams[constants.NIC_MODE] == constants.NIC_MODE_OVS:
128
      # default ovs is different from default bridge
129
      master_netdev = constants.DEFAULT_OVS
130
      opts.nicparams[constants.NIC_LINK] = constants.DEFAULT_OVS
125 131

  
126 132
  hvlist = opts.enabled_hypervisors
127 133
  if hvlist is None:
b/lib/constants.py
719 719

  
720 720
# others
721 721
DEFAULT_BRIDGE = "xen-br0"
722
DEFAULT_OVS = "switch1"
722 723
CLASSIC_DRBD_SYNC_SPEED = 60 * 1024  # 60 MiB, expressed in KiB
723 724
IP4_ADDRESS_LOCALHOST = "127.0.0.1"
724 725
IP4_ADDRESS_ANY = "0.0.0.0"

Also available in: Unified diff