From 6a2a623f0b4e953f070d6ad06bf799be595bbd73 Mon Sep 17 00:00:00 2001
From: Madhu Mohan Nelemane <mmnelemane@suse.com>
Date: Tue, 8 Mar 2016 16:52:04 +0100
Subject: [PATCH] Fix use of devstack-based branch for congress

Devstack uses the github URL provided in local.conf.
Doing stack.sh does checkout the relevant branch.
plugin.sh need not explicitly checkout the branch. The plugin can
install only the congressclient and any other dependencies
(like java-jre) from the script.
Also adding a README.rst for enabling the plugin for devstack.

Change-Id: I3daacfbbedf067392410535820f364e788905fe4
Closes-Bug: #1503353
---
 devstack/plugin.sh | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 2efa1e70e..435b925ea 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -161,15 +161,10 @@ function init_congress {
     congress-db-manage --config-file $CONGRESS_CONF upgrade head
 }
 
-# install_congress() - Collect source and prepare
+# install_congress() - install dependency, collect client source and prepare
 function install_congress {
-    git_clone $CONGRESS_REPO $CONGRESS_DIR $CONGRESS_BRANCH
     # congress requires java so we install it here
     install_package default-jre
-}
-
-# install_congressclient() - Collect source and prepare
-function install_congressclient {
     git_clone $CONGRESSCLIENT_REPO $CONGRESSCLIENT_DIR $CONGRESSCLIENT_BRANCH
     setup_develop $CONGRESSCLIENT_DIR
 }
@@ -266,7 +261,6 @@ if is_service_enabled congress; then
     if [[ "$1" == "stack" && "$2" == "install" ]]; then
         echo_summary "Installing Congress"
         install_congress
-        install_congressclient
     elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
         echo_summary "Configuring Congress"
         configure_congressclient