From ec0865127e6e8c772dcb0838d6ee5f113161c2f3 Mon Sep 17 00:00:00 2001
From: Maru Newby <mnewby@internap.com>
Date: Thu, 1 Nov 2012 23:44:57 +0000
Subject: [PATCH] Ensure that tempest configuration happens last.

 * Tempest configuration relies on having other services such as
   Glance and Nova running and accepting requests.  Previously,
   configuration was happening before these services were started.
   This change ensures that Tempest configuration is performed
   after the necessary services have been started.

Change-Id: If0b6753dd51671fbc2a2cf6ad32ce9303d0a0479
---
 stack.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/stack.sh b/stack.sh
index 29e495378b..b148d53481 100755
--- a/stack.sh
+++ b/stack.sh
@@ -935,9 +935,6 @@ fi
 if is_service_enabled cinder; then
     configure_cinder
 fi
-if is_service_enabled tempest; then
-    configure_tempest
-fi
 if is_service_enabled ryu || (is_service_enabled quantum && [[ "$Q_PLUGIN" = "ryu" ]]); then
     setup_develop $RYU_DIR
 fi
@@ -2055,6 +2052,13 @@ if is_service_enabled g-reg; then
 fi
 
 
+# Configure Tempest last to ensure that the runtime configuration of
+# the various OpenStack services can be queried.
+if is_service_enabled tempest; then
+    configure_tempest
+fi
+
+
 # Run local script
 # ================