From b5da51972cf8d6e7919d87dfe0767bffdb16a441 Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Mon, 17 Oct 2011 13:32:06 -0500
Subject: [PATCH] Always use current devstack in ramdisk

---
 stackrc                |  4 ----
 tools/build_ramdisk.sh | 11 ++++-------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/stackrc b/stackrc
index 871db69..15d73ce 100644
--- a/stackrc
+++ b/stackrc
@@ -27,10 +27,6 @@ NOVACLIENT_BRANCH=master
 OPENSTACKX_REPO=https://github.com/cloudbuilders/openstackx.git
 OPENSTACKX_BRANCH=diablo
 
-# devstack is this collection of scripts
-DEVSTACK_REPO=https://github.com/cloudbuilders/devstack.git
-DEVSTACK_BRANCH=master
-
 # allow local overrides of env variables
 if [ -f ./localrc ]; then
     source ./localrc
diff --git a/tools/build_ramdisk.sh b/tools/build_ramdisk.sh
index 85d3743..437b103 100755
--- a/tools/build_ramdisk.sh
+++ b/tools/build_ramdisk.sh
@@ -96,13 +96,10 @@ git_clone $DASH_REPO $DEST/dash $DASH_BRANCH
 git_clone $NOVACLIENT_REPO $DEST/python-novaclient $NOVACLIENT_BRANCH
 git_clone $OPENSTACKX_REPO $DEST/openstackx $OPENSTACKX_BRANCH
 
-# Use this version of devstack?
-if [ "$USE_CURRENT_DEVSTACK" = "1" ]; then
-    rm -rf $CHROOTCACHE/natty-stack/$DEST/devstack
-    cp -pr $CWD $CHROOTCACHE/natty-stack/$DEST/devstack
-else
-    git_clone $DEVSTACK_REPO $DEST/devstack $DEVSTACK_BRANCH
-fi
+# Use this version of devstack
+rm -rf $CHROOTCACHE/natty-stack/$DEST/devstack
+cp -pr $CWD $CHROOTCACHE/natty-stack/$DEST/devstack
+chroot $CHROOTCACHE/natty-stack chown -R stack $DEST/devstack
 
 # Configure host network for DHCP
 mkdir -p $CHROOTCACHE/natty-stack/etc/network