From 3472386273bccea2375b15c1902e300bade88c33 Mon Sep 17 00:00:00 2001
From: Matthew Treinish <mtreinish@kortar.org>
Date: Mon, 8 Sep 2014 14:01:21 -0400
Subject: [PATCH] Install tempest-lib as part of install_tempest

This commit adds support to devstack to install the newly created
tempest-lib project.

Change-Id: Ifcf56639757ec4814dcd31f791931afe61f5a672
---
 lib/tempest | 8 ++++++++
 stackrc     | 3 +++
 2 files changed, 11 insertions(+)

diff --git a/lib/tempest b/lib/tempest
index 0c793049e8..906cb00f95 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -48,6 +48,7 @@ TEMPEST_DIR=$DEST/tempest
 TEMPEST_CONFIG_DIR=${TEMPEST_CONFIG_DIR:-$TEMPEST_DIR/etc}
 TEMPEST_CONFIG=$TEMPEST_CONFIG_DIR/tempest.conf
 TEMPEST_STATE_PATH=${TEMPEST_STATE_PATH:=$DATA_DIR/tempest}
+TEMPEST_LIB_DIR=$DEST/tempest-lib
 
 NOVA_SOURCE_DIR=$DEST/nova
 
@@ -428,8 +429,15 @@ function create_tempest_accounts {
     fi
 }
 
+# install_tempest_lib() - Collect source, prepare, and install tempest-lib
+function install_tempest_lib {
+    git_clone $TEMPEST_LIB_REPO $TEMPEST_LIB_DIR $TEMPEST_LIB_BRANCH
+    setup_develop $TEMPEST_LIB_DIR
+}
+
 # install_tempest() - Collect source and prepare
 function install_tempest {
+    install_tempest_lib
     git_clone $TEMPEST_REPO $TEMPEST_DIR $TEMPEST_BRANCH
     pip_install tox
 }
diff --git a/stackrc b/stackrc
index 53c857935a..936eb9c293 100644
--- a/stackrc
+++ b/stackrc
@@ -311,6 +311,9 @@ SWIFTCLIENT_BRANCH=${SWIFTCLIENT_BRANCH:-master}
 TEMPEST_REPO=${TEMPEST_REPO:-${GIT_BASE}/openstack/tempest.git}
 TEMPEST_BRANCH=${TEMPEST_BRANCH:-master}
 
+TEMPEST_LIB_REPO=${TEMPEST_LIB_REPO:-${GIT_BASE}/openstack/tempest-lib.git}
+TEMPEST_LIB_BRANCH=${TEMPEST_LIB_BRANCH:-master}
+
 # Tripleo elements for diskimage-builder images
 TIE_REPO=${TIE_REPO:-${GIT_BASE}/openstack/tripleo-image-elements.git}
 TIE_BRANCH=${TIE_BRANCH:-master}