openstack/devstack
Code Issues Proposed changes

Merge "Changes to make devstack work with the essex + xen"

Browse Source
This commit is contained in:
Jenkins 2012-01-13 00:09:47 +00:00 committed by Gerrit Code Review
commit 9bd4e353bb
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
stack.sh
View File

@ -1161,9 +1161,9 @@ if [ "$VIRT_DRIVER" = 'xenserver' ]; then
add_nova_flag "--xenapi_connection_url=http://169.254.0.1"
add_nova_flag "--xenapi_connection_username=root"
add_nova_flag "--xenapi_connection_password=$XENAPI_PASSWORD"
add_nova_flag "--flat_injected=False"
add_nova_flag "--noflat_injected"
add_nova_flag "--flat_interface=eth1"
add_nova_flag "--flat_network_bridge=xenbr1"
add_nova_flag "--flat_network_bridge=xapi1"
add_nova_flag "--public_interface=eth3"
else
add_nova_flag "--flat_network_bridge=$FLAT_NETWORK_BRIDGE"

9
tools/xen/build_domU.sh
View File

@ -33,12 +33,12 @@ PUB_NETMASK=${PUB_NETMASK:-255.255.255.0}
# VM network params
VM_NETMASK=${VM_NETMASK:-255.255.255.0}
VM_BR=${VM_BR:-xenbr1}
VM_BR=${VM_BR:-xapi1}
VM_VLAN=${VM_VLAN:-100}
# MGMT network params
MGT_NETMASK=${MGT_NETMASK:-255.255.255.0}
MGT_BR=${MGT_BR:-xenbr2}
MGT_BR=${MGT_BR:-xapi2}
MGT_VLAN=${MGT_VLAN:-101}
# VM Password
@ -205,8 +205,9 @@ fi
# Checkout nova
if [ ! -d $TOP_DIR/nova ]; then
git clone git://github.com/cloudbuilders/nova.git
git checkout diablo
git clone $NOVA_REPO
cd $TOP_DIR/nova
git checkout $NOVA_BRANCH
fi
# Run devstack on launch