use better bridge names

This commit is contained in:
Anthony Young 2011-10-27 12:53:30 -07:00
parent d7f29e6366
commit ea1290a997
2 changed files with 3 additions and 3 deletions

View file

@ -629,7 +629,7 @@ if [ "$VIRT_DRIVER" = 'xenserver' ]; then
add_nova_flag "--xenapi_connection_password=$XENAPI_PASSWORD"
add_nova_flag "--flat_injected=False"
add_nova_flag "--flat_interface=eth1"
add_nova_flag "--flat_network_bridge=xapi1"
add_nova_flag "--flat_network_bridge=xenbr1"
add_nova_flag "--public_interface=eth3"
else
add_nova_flag "--flat_network_bridge=$FLAT_NETWORK_BRIDGE"

View file

@ -27,12 +27,12 @@ PUB_NETMASK=${PUB_NETMASK:-255.255.255.0}
# VM network params
VM_NETMASK=${VM_NETMASK:-255.255.255.0}
VM_BR=${VM_BR:-xapi1}
VM_BR=${VM_BR:-xenbr1}
VM_VLAN=${VM_VLAN:-100}
# MGMT network params
MGT_NETMASK=${MGT_NETMASK:-255.255.255.0}
MGT_BR=${MGT_BR:-xapi2}
MGT_BR=${MGT_BR:-xenbr2}
MGT_VLAN=${MGT_VLAN:-101}
# VM Password