@@ -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

 }

@@ -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}