diff options
| author | Dean Troyer <dtroyer@gmail.com> | 2014-11-14 17:01:49 -0600 |
|---|---|---|
| committer | Dean Troyer <dtroyer@gmail.com> | 2014-11-14 17:01:49 -0600 |
| commit | be3cbd22bdad19d610636c170f21c311ebe80dac (patch) | |
| tree | 61bc824bfc5f205b29a1a24460f101412ee78ff8 | |
| parent | f5a2811b6546007eac055151e320005c0d4410d0 (diff) | |
| download | python-openstackclient-be3cbd22bdad19d610636c170f21c311ebe80dac.tar.gz | |
Look harder to find DevStack
Change-Id: Ice5cc560513c5ada1c7a525464cd2823d5979542
| -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 { |