From a34b695aadb6db1aedd5543604dac0400cd90b34 Mon Sep 17 00:00:00 2001
From: Anthony Young <sleepsonthefloor@gmail.com>
Date: Mon, 26 Sep 2011 15:24:59 -0700
Subject: [PATCH] by default, use the current version/directory of devstack for
 child lxc containers

---
 build_lxc.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/build_lxc.sh b/build_lxc.sh
index 4c624aab89..674742c3e2 100755
--- a/build_lxc.sh
+++ b/build_lxc.sh
@@ -23,6 +23,9 @@ COPYENV=${COPYENV:-1}
 # Param string to pass to stack.sh.  Like "EC2_DMZ_HOST=192.168.1.1 MYSQL_USER=nova"
 STACKSH_PARAMS=${STACKSH_PARAMS:-}
 
+# Option to use the version of devstack on which we are currently working
+USE_CURRENT_DEVSTACK=${USE_CURRENT_DEVSTACK:-1}
+
 # Warn users who aren't on natty
 if ! grep -q natty /etc/lsb-release; then
     echo "WARNING: this script has only been tested on natty"
@@ -99,6 +102,12 @@ git_clone $NOVACLIENT_REPO $CACHEDIR/opt/python-novaclient $NOVACLIENT_BRANCH
 git_clone $OPENSTACKX_REPO $CACHEDIR/opt/openstackx $OPENSTACKX_BRANCH
 git_clone $MUNIN_REPO $CACHEDIR/opt/openstack-munin $MUNIN_BRANCH
 
+# Use this version of devstack?
+if [ "$USE_CURRENT_DEVSTACK" = "1" ]; then
+    rm -rf $CACHEDIR/opt/devstack
+    cp -pr . $CACHEDIR/opt/devstack
+fi
+
 # Destroy the old container
 lxc-destroy -n $CONTAINER