openstack/python-openstackclient
Code Issues Proposed changes

Look harder to find DevStack

Browse Source 
Change-Id: Ice5cc560513c5ada1c7a525464cd2823d5979542
This commit is contained in:
Dean Troyer 2014-11-14 17:01:49 -06:00
parent f5a2811b65
commit be3cbd22bd
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
functional/harpoon.sh
View File

@ -6,8 +6,15 @@ source $FUNCTIONAL_TEST_DIR/harpoonrc
OPENSTACKCLIENT_DIR=$FUNCTIONAL_TEST_DIR/.. OPENSTACKCLIENT_DIR=$FUNCTIONAL_TEST_DIR/..
if [[ -z $DEVSTACK_DIR ]]; then if [[ -z $DEVSTACK_DIR ]]; then
echo "guessing location of devstack"
DEVSTACK_DIR=$OPENSTACKCLIENT_DIR/../devstack DEVSTACK_DIR=$OPENSTACKCLIENT_DIR/../devstack
if [[ ! -d $DEVSTACK_DIR ]]; then
DEVSTACK_DIR=$HOME/devstack
if [[ ! -d $DEVSTACK_DIR ]]; then
echo "Where did you hide DevStack? Set DEVSTACK_DIR and try again"
exit 1
fi
fi
echo "Using DevStack found at $DEVSTACK_DIR"
fi fi
function setup_credentials { function setup_credentials {