From fee3d18f1a1daf3c84bbeecfa68dfa37926e59d6 Mon Sep 17 00:00:00 2001
From: Matthew Treinish <mtreinish@kortar.org>
Date: Wed, 1 Jun 2016 18:16:14 -0400
Subject: [PATCH] Move tempest plugin install to the end

For the tempest plugin install inside the tox venv to hold we need to
ensure that it's the last thing run that touches the tox venv before
devstack ends. Otherwise there is a chance we'll recreate the venv in
a later step of installing and configuring tempest. This commit
moves the plugin installation into it's own function and calls that
function as last phase of the tempest setup to make sure it runs last.

Change-Id: Ie253171537e8c5a9887cc30aba1cad4b31e57663
(cherry picked from commit 7e603d1bf8689a50ffa3dd93c901a71ea5f5ae36)
---
 extras.d/80-tempest.sh | 2 ++
 lib/tempest            | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/extras.d/80-tempest.sh b/extras.d/80-tempest.sh
index 74f4c60d10..c250518733 100644
--- a/extras.d/80-tempest.sh
+++ b/extras.d/80-tempest.sh
@@ -14,6 +14,8 @@ if is_service_enabled tempest; then
         echo_summary "Initializing Tempest"
         configure_tempest
         init_tempest
+        echo_summary "Installing Tempest Plugins"
+        install_tempest_plugins
     elif [[ "$1" == "stack" && "$2" == "post-extra" ]]; then
         # local.conf Tempest option overrides
         :
diff --git a/lib/tempest b/lib/tempest
index 5e40cb6e08..5e6d4e04a2 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -636,6 +636,12 @@ function install_tempest {
     pushd $TEMPEST_DIR
     tox --notest -efull
     PROJECT_VENV["tempest"]=${TEMPEST_DIR}/.tox/tempest
+    popd
+}
+
+# install_tempest_plugins() - Install any specified plugins into the tempest venv
+function install_tempest_plugins {
+    pushd $TEMPEST_DIR
     if [[ $TEMPEST_PLUGINS != 0 ]] ; then
         tox -evenv-tempest -- pip install $TEMPEST_PLUGINS
     fi