openstack/python-openstackclient
Code Issues Proposed changes

Merge "Look harder to find DevStack"

Browse Source
This commit is contained in:
Jenkins 2015-03-12 03:10:54 +00:00 committed by Gerrit Code Review
commit a8c44074f9
1 changed files with 8 additions and 1 deletions

9
functional/harpoon.sh

@ -6,8 +6,15 @@ source $FUNCTIONAL_TEST_DIR/harpoonrc
OPENSTACKCLIENT_DIR=$FUNCTIONAL_TEST_DIR/..
if [[ -z $DEVSTACK_DIR ]]; then
echo "guessing location of 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
function setup_credentials {