openstack/devstack
Code Issues Proposed changes

Remove hardcoding of flat network bridge

Browse Source 
Change-Id: I66210ba438c1d8a2c12223b8895581127130ad5f
This commit is contained in:
Renuka Apte 2012-03-01 15:43:36 -08:00
parent 57bd449431
commit 3993816fe6
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
stack.sh
View File

@ -1262,6 +1262,8 @@ done
# --------- # ---------
if [ "$VIRT_DRIVER" = 'xenserver' ]; then if [ "$VIRT_DRIVER" = 'xenserver' ]; then
# Get the VM bridge
FLAT_NETWORK_BRIDGE=$(grep -o 'flat_network_bridge=[^.]*' /proc/cmdline | cut -d= -f 2)
read_password XENAPI_PASSWORD "ENTER A PASSWORD TO USE FOR XEN." read_password XENAPI_PASSWORD "ENTER A PASSWORD TO USE FOR XEN."
add_nova_flag "--connection_type=xenapi" add_nova_flag "--connection_type=xenapi"
add_nova_flag "--xenapi_connection_url=http://169.254.0.1" add_nova_flag "--xenapi_connection_url=http://169.254.0.1"
@ -1269,8 +1271,8 @@ if [ "$VIRT_DRIVER" = 'xenserver' ]; then
add_nova_flag "--xenapi_connection_password=$XENAPI_PASSWORD" add_nova_flag "--xenapi_connection_password=$XENAPI_PASSWORD"
add_nova_flag "--noflat_injected" add_nova_flag "--noflat_injected"
add_nova_flag "--flat_interface=eth1" add_nova_flag "--flat_interface=eth1"
add_nova_flag "--flat_network_bridge=xapi1" add_nova_flag "--flat_network_bridge=${FLAT_NETWORK_BRIDGE}"
add_nova_flag "--public_interface=eth3" add_nova_flag "--public_interface=${HOST_IP_IFACE}"
# Need to avoid crash due to new firewall support # Need to avoid crash due to new firewall support
XEN_FIREWALL_DRIVER=${XEN_FIREWALL_DRIVER:-"nova.virt.firewall.IptablesFirewallDriver"} XEN_FIREWALL_DRIVER=${XEN_FIREWALL_DRIVER:-"nova.virt.firewall.IptablesFirewallDriver"}
add_nova_flag "--firewall_driver=$XEN_FIREWALL_DRIVER" add_nova_flag "--firewall_driver=$XEN_FIREWALL_DRIVER"

2
tools/xen/build_domU.sh
View File

@ -182,7 +182,7 @@ fi
if [ -z $PUB_BR ]; then if [ -z $PUB_BR ]; then
PUB_BR=$(xe network-list --minimal uuid=$PUB_NET params=bridge) PUB_BR=$(xe network-list --minimal uuid=$PUB_NET params=bridge)
fi fi
$TOP_DIR/scripts/install-os-vpx.sh -f $XVA -v $VM_BR -m $MGT_BR -p $PUB_BR -l $GUEST_NAME -w $TOP_DIR/scripts/install-os-vpx.sh -f $XVA -v $VM_BR -m $MGT_BR -p $PUB_BR -l $GUEST_NAME -w -k "flat_network_bridge=${VM_BR}"
# If we have copied our ssh credentials, use ssh to monitor while the installation runs # If we have copied our ssh credentials, use ssh to monitor while the installation runs
WAIT_TILL_LAUNCH=${WAIT_TILL_LAUNCH:-1} WAIT_TILL_LAUNCH=${WAIT_TILL_LAUNCH:-1}