commit 419770faadd5390277d94098518cc439f83f7997
author Anthony Young <sleepsonthefloor@gmail.com> Wed Jan 11 17:35:40 2012 -0800
committer Anthony Young <sleepsonthefloor@gmail.com> Wed Jan 11 17:45:40 2012 -0800
tree eb82dbb05b52be4ea372059ace724e16b2e21902
parent ea4a53da619c8ce7e65141a17b68ce314e729e60

Changes to make devstack work with the essex + xen

Change-Id: If932d82ec72494d871ad65ae863947816e719624

stack.sh

diff --git a/stack.sh b/stack.sh
index c0763d4..0e13182 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1156,9 +1156,9 @@
     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"

tools/xen/build_domU.sh

diff --git a/tools/xen/build_domU.sh b/tools/xen/build_domU.sh
index d79d5c3..642b40f 100755
--- a/tools/xen/build_domU.sh
+++ b/tools/xen/build_domU.sh
@@ -33,12 +33,12 @@
 
 # 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 @@
 
 # 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