From 419770faadd5390277d94098518cc439f83f7997 Mon Sep 17 00:00:00 2001 From: Anthony Young Date: Wed, 11 Jan 2012 17:35:40 -0800 Subject: [PATCH] Changes to make devstack work with the essex + xen Change-Id: If932d82ec72494d871ad65ae863947816e719624 --- stack.sh | 4 ++-- tools/xen/build_domU.sh | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/stack.sh b/stack.sh index c0763d46a3..0e1318227f 100755 --- a/stack.sh +++ b/stack.sh @@ -1156,9 +1156,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" diff --git a/tools/xen/build_domU.sh b/tools/xen/build_domU.sh index d79d5c3e1e..642b40f753 100755 --- a/tools/xen/build_domU.sh +++ b/tools/xen/build_domU.sh @@ -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