Merge "Install and configure python-heatclient."

This commit is contained in:
Jenkins 2012-11-10 12:53:31 +00:00 committed by Gerrit Code Review
commit f5c221525d
3 changed files with 17 additions and 1 deletions

View File

@ -23,7 +23,7 @@ set +o xtrace
# Defaults
# --------
HEAT_DIR=$DEST/heat
HEATCLIENT_DIR=$DEST/python-heatclient
# set up default directories
# cleanup_heat() - Remove residual data files, anything left over from previous
@ -33,6 +33,11 @@ function cleanup_heat() {
:
}
# configure_heatclient() - Set config files, create data dirs, etc
function configure_heatclient() {
setup_develop $HEATCLIENT_DIR
}
# configure_heat() - Set config files, create data dirs, etc
function configure_heat() {
setup_develop $HEAT_DIR
@ -193,6 +198,11 @@ function init_heat() {
$HEAT_DIR/tools/nova_create_flavors.sh
}
# install_heatclient() - Collect source and prepare
function install_heatclient() {
git_clone $HEATCLIENT_REPO $HEATCLIENT_DIR $HEATCLIENT_BRANCH
}
# install_heat() - Collect source and prepare
function install_heat() {
git_clone $HEAT_REPO $HEAT_DIR $HEAT_BRANCH

View File

@ -860,6 +860,7 @@ if is_service_enabled quantum; then
fi
if is_service_enabled heat; then
install_heat
install_heatclient
fi
if is_service_enabled cinder; then
install_cinder
@ -915,6 +916,7 @@ if is_service_enabled quantum; then
fi
if is_service_enabled heat; then
configure_heat
configure_heatclient
fi
if is_service_enabled cinder; then
configure_cinder

View File

@ -101,6 +101,10 @@ TEMPEST_BRANCH=master
HEAT_REPO=${GIT_BASE}/heat-api/heat.git
HEAT_BRANCH=master
# python heat client library
HEATCLIENT_REPO=${GIT_BASE}/heat-api/python-heatclient.git
HEATCLIENT_BRANCH=master
# ryu service
RYU_REPO=https://github.com/osrg/ryu.git
RYU_BRANCH=master