From 5ea9945530867e38474540e00fa172f2ba60fedf Mon Sep 17 00:00:00 2001
From: Sean Dague <sean@dague.net>
Date: Thu, 23 Apr 2015 07:32:32 -0400
Subject: [PATCH] allow DEVSTACK_DIRS to be overridden

Allowing DEVSTACK_DIRS to be overridden lets the run_resources.sh
script work outside of grenade. This is needed for the -d option added
in the last patch to actually do something useful.

Change-Id: Ic56e300a0ab1872e4cef37a22dd09cd4a8dd1e92
---
 grenaderc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/grenaderc b/grenaderc
index 6893a062..2db984d4 100644
--- a/grenaderc
+++ b/grenaderc
@@ -28,11 +28,11 @@ TARGET_RELEASE_DIR=${STACK_ROOT}/$TARGET_RELEASE
 # DevStack sources
 BASE_DEVSTACK_REPO=$GIT_BASE/openstack-dev/devstack.git
 BASE_DEVSTACK_BRANCH=${BASE_DEVSTACK_BRANCH:-stable/$BASE_RELEASE}
-BASE_DEVSTACK_DIR=$BASE_RELEASE_DIR/devstack
+BASE_DEVSTACK_DIR=${BASE_DEVSTACK_DIR:-$BASE_RELEASE_DIR/devstack}
 
 TARGET_DEVSTACK_REPO=$BASE_DEVSTACK_REPO
 TARGET_DEVSTACK_BRANCH=${TARGET_DEVSTACK_BRANCH:-master}
-TARGET_DEVSTACK_DIR=$TARGET_RELEASE_DIR/devstack
+TARGET_DEVSTACK_DIR=${TARGET_DEVSTACK_DIR:-$TARGET_RELEASE_DIR/devstack}
 
 TEMPEST_CONCURRENCY=${TEMPEST_CONCURRENCY:-$(nproc --all)}