From c578969b550bd73a701714b01274d76a3426aa67 Mon Sep 17 00:00:00 2001
From: Anastasia Kuznetsova <akuznetsova@mirantis.com>
Date: Wed, 25 Nov 2015 17:07:52 +0300
Subject: [PATCH] Change installation of python-mistralclient in the gates

After this commit 'gate-mistral-devstack-dsvm' will install
mistral from commit and latest released python-mistralclient,
'gate-mistralclient-devstack-dsvm' will install python-mistralclient
from commit and mistral from master.

Partially implements: blueprint mistral-making-dsvm-gates-voting

Change-Id: Ia0c9bb84412b39c571565db1f00188c4e0db71fc
---
 devstack/plugin.sh | 26 ++++++++++++++++----------
 devstack/settings  |  2 +-
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 74778a721..bcd024647 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -1,4 +1,11 @@
-# Setting configuration file for Mistral services
+# ``stack.sh`` calls the entry points in this order:
+#
+# install_mistral
+# install_python_mistralclient
+# configure_mistral
+# start_mistral
+# stop_mistral
+# cleanup_mistral
 
 # Save trace setting
 XTRACE=$(set +o | grep xtrace)
@@ -98,10 +105,6 @@ function init_mistral {
 
 # install_mistral - Collect source and prepare
 function install_mistral {
-    install_mistral_pythonclient
-
-    git_clone $MISTRAL_REPO $MISTRAL_DIR $MISTRAL_BRANCH
-
     setup_develop $MISTRAL_DIR -e
 
     # installing python-nose.
@@ -121,12 +124,14 @@ function _install_mistraldashboard {
 
 
 function install_mistral_pythonclient {
-    git_clone $MISTRAL_PYTHONCLIENT_REPO $MISTRAL_PYTHONCLIENT_DIR $MISTRAL_PYTHONCLIENT_BRANCH
-    local tags=`git --git-dir=$MISTRAL_PYTHONCLIENT_DIR/.git tag -l | grep 2015`
-    if [ ! "$tags" = "" ]; then
-        git --git-dir=$MISTRAL_PYTHONCLIENT_DIR/.git tag -d $tags
+    if use_library_from_git "python-mistralclient"; then
+        git_clone $MISTRAL_PYTHONCLIENT_REPO $MISTRAL_PYTHONCLIENT_DIR $MISTRAL_PYTHONCLIENT_BRANCH
+        local tags=`git --git-dir=$MISTRAL_PYTHONCLIENT_DIR/.git tag -l | grep 2015`
+        if [ ! "$tags" = "" ]; then
+            git --git-dir=$MISTRAL_PYTHONCLIENT_DIR/.git tag -d $tags
+        fi
+        setup_develop $MISTRAL_PYTHONCLIENT_DIR -e
     fi
-    setup_develop $MISTRAL_PYTHONCLIENT_DIR -e
 }
 
 
@@ -159,6 +164,7 @@ if is_service_enabled mistral; then
     if [[ "$1" == "stack" && "$2" == "install" ]]; then
         echo_summary "Installing mistral"
         install_mistral
+        install_mistral_pythonclient
     elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
         echo_summary "Configuring mistral"
         configure_mistral
diff --git a/devstack/settings b/devstack/settings
index 863e44a1e..168f68ff3 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -12,7 +12,7 @@ MISTRAL_DASHBOARD_REPO=${MISTRAL_DASHBOARD_REPO:-${GIT_BASE}/openstack/mistral-d
 MISTRAL_DASHBOARD_BRANCH=${MISTRAL_DASHBOARD_BRANCH:-$MISTRAL_BRANCH}
 
 MISTRAL_PYTHONCLIENT_REPO=${MISTRAL_PYTHONCLIENT_REPO:-${GIT_BASE}/openstack/python-mistralclient.git}
-MISTRAL_PYTHONCLIENT_BRANCH=${MISTRAL_PYTHONCLIENT_BRANCH:-$MISTRAL_BRANCH}
+MISTRAL_PYTHONCLIENT_BRANCH=${MISTRAL_PYTHONCLIENT_BRANCH:-master}
 MISTRAL_PYTHONCLIENT_DIR=$DEST/python-mistralclient
 
 # Set up default directories