Default USE_CURRENT_DEVSTACK to 1

This commit is contained in:
Dean Troyer 2011-10-03 11:14:13 -05:00
parent 6994f94789
commit a3379e0eb1
2 changed files with 6 additions and 0 deletions

View file

@ -13,6 +13,9 @@ NAME=$1
NFSDIR="/nfs/$NAME" NFSDIR="/nfs/$NAME"
DEST=${DEST:-/opt/stack} DEST=${DEST:-/opt/stack}
# Option to use the version of devstack on which we are currently working
USE_CURRENT_DEVSTACK=${USE_CURRENT_DEVSTACK:-1}
# remove old nfs filesystem if one exists # remove old nfs filesystem if one exists
rm -rf $DEST rm -rf $DEST

View file

@ -17,6 +17,9 @@ CWD=`pwd`
DEST=${DEST:-/opt/stack} DEST=${DEST:-/opt/stack}
# Option to use the version of devstack on which we are currently working
USE_CURRENT_DEVSTACK=${USE_CURRENT_DEVSTACK:-1}
# clean install of natty # clean install of natty
if [ ! -d $CHROOTCACHE/natty-base ]; then if [ ! -d $CHROOTCACHE/natty-base ]; then
$PROGDIR/make_image.sh -C natty $CHROOTCACHE/natty-base $PROGDIR/make_image.sh -C natty $CHROOTCACHE/natty-base