openstack/devstack
Code Issues Proposed changes

Always use current devstack in ramdisk

Browse Source
This commit is contained in:
Dean Troyer 2011-10-17 13:32:06 -05:00
parent f6fd4dcf2e
commit b5da51972c
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
stackrc
View File

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

11
tools/build_ramdisk.sh
View File

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