commit b5da51972cf8d6e7919d87dfe0767bffdb16a441
author Dean Troyer <dtroyer@gmail.com> Mon Oct 17 13:32:06 2011 -0500
committer Dean Troyer <dtroyer@gmail.com> Mon Oct 17 14:19:05 2011 -0500
tree 4e15bf7e84594c80e9bbeee6a18e389c9353b012
parent f6fd4dcf2e9c29f3ed4b911abc16bbb4b8af4b70

Always use current devstack in ramdisk

tools/build_ramdisk.sh

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 $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