From be3cbd22bdad19d610636c170f21c311ebe80dac Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Fri, 14 Nov 2014 17:01:49 -0600
Subject: [PATCH] Look harder to find DevStack
Change-Id: Ice5cc560513c5ada1c7a525464cd2823d5979542
---
functional/harpoon.sh | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/functional/harpoon.sh b/functional/harpoon.sh
index 76c10ffb95..4e16391794 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 {