diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-03-12 03:10:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-03-12 03:10:54 +0000 |
| commit | a8c44074f93815ea670d4bc09156795c66505f31 (patch) | |
| tree | 8cc4b4738c4a146d4ed8a11d1450fef5374b1d26 | |
| parent | a9d1e3d2192aa965d15c89eb6a603faf2e95b7ec (diff) | |
| parent | be3cbd22bdad19d610636c170f21c311ebe80dac (diff) | |
| download | python-openstackclient-a8c44074f93815ea670d4bc09156795c66505f31.tar.gz | |
Merge "Look harder to find DevStack"
| -rwxr-xr-x | functional/harpoon.sh | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/functional/harpoon.sh b/functional/harpoon.sh index 76c10ffb..4e163917 100755 --- a/functional/harpoon.sh +++ b/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 { |