From a3379e0eb13ebf3e8c25d40ea3f79a2189f8f75b Mon Sep 17 00:00:00 2001 From: Dean Troyer Date: Mon, 3 Oct 2011 11:14:13 -0500 Subject: [PATCH] Default USE_CURRENT_DEVSTACK to 1 --- build_nfs.sh | 3 +++ build_pxe_ramdisk.sh | 3 +++ 2 files changed, 6 insertions(+) diff --git a/build_nfs.sh b/build_nfs.sh index a6c8b4c..f2a7b13 100755 --- a/build_nfs.sh +++ b/build_nfs.sh @@ -13,6 +13,9 @@ NAME=$1 NFSDIR="/nfs/$NAME" 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 rm -rf $DEST diff --git a/build_pxe_ramdisk.sh b/build_pxe_ramdisk.sh index feba18e..63e2ed4 100755 --- a/build_pxe_ramdisk.sh +++ b/build_pxe_ramdisk.sh @@ -17,6 +17,9 @@ CWD=`pwd` 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 if [ ! -d $CHROOTCACHE/natty-base ]; then $PROGDIR/make_image.sh -C natty $CHROOTCACHE/natty-base