use explicit CWD when compying devstack

This commit is contained in:
Anthony Young 2011-09-26 16:19:50 -07:00
parent 9563361cf4
commit 84064daed3

View File

@ -10,6 +10,9 @@ fi
# Source params # Source params
source ./stackrc source ./stackrc
# Store cwd
CWD=`pwd`
# Configurable params # Configurable params
BRIDGE=${BRIDGE:-br0} BRIDGE=${BRIDGE:-br0}
CONTAINER=${CONTAINER:-STACK} CONTAINER=${CONTAINER:-STACK}
@ -105,7 +108,7 @@ git_clone $MUNIN_REPO $CACHEDIR/opt/openstack-munin $MUNIN_BRANCH
# Use this version of devstack? # Use this version of devstack?
if [ "$USE_CURRENT_DEVSTACK" = "1" ]; then if [ "$USE_CURRENT_DEVSTACK" = "1" ]; then
rm -rf $CACHEDIR/opt/devstack rm -rf $CACHEDIR/opt/devstack
cp -pr . $CACHEDIR/opt/devstack cp -pr $CWD $CACHEDIR/opt/devstack
fi fi
# Destroy the old container # Destroy the old container