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
This commit is contained in:
parent
e3c0813f9c
commit
6a2a623f0b
|
@ -161,15 +161,10 @@ function init_congress {
|
||||||
congress-db-manage --config-file $CONGRESS_CONF upgrade head
|
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 {
|
function install_congress {
|
||||||
git_clone $CONGRESS_REPO $CONGRESS_DIR $CONGRESS_BRANCH
|
|
||||||
# congress requires java so we install it here
|
# congress requires java so we install it here
|
||||||
install_package default-jre
|
install_package default-jre
|
||||||
}
|
|
||||||
|
|
||||||
# install_congressclient() - Collect source and prepare
|
|
||||||
function install_congressclient {
|
|
||||||
git_clone $CONGRESSCLIENT_REPO $CONGRESSCLIENT_DIR $CONGRESSCLIENT_BRANCH
|
git_clone $CONGRESSCLIENT_REPO $CONGRESSCLIENT_DIR $CONGRESSCLIENT_BRANCH
|
||||||
setup_develop $CONGRESSCLIENT_DIR
|
setup_develop $CONGRESSCLIENT_DIR
|
||||||
}
|
}
|
||||||
|
@ -266,7 +261,6 @@ if is_service_enabled congress; then
|
||||||
if [[ "$1" == "stack" && "$2" == "install" ]]; then
|
if [[ "$1" == "stack" && "$2" == "install" ]]; then
|
||||||
echo_summary "Installing Congress"
|
echo_summary "Installing Congress"
|
||||||
install_congress
|
install_congress
|
||||||
install_congressclient
|
|
||||||
elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
|
elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
|
||||||
echo_summary "Configuring Congress"
|
echo_summary "Configuring Congress"
|
||||||
configure_congressclient
|
configure_congressclient
|
||||||
|
|
Loading…
Reference in New Issue