Merge "Install and configure python-heatclient."
diff --git a/lib/heat b/lib/heat
index d1f1c7c..efdcfad 100644
--- a/lib/heat
+++ b/lib/heat
@@ -23,7 +23,7 @@
# 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 @@
:
}
+# 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 @@
$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
diff --git a/stack.sh b/stack.sh
index 084f276..40eab36 100755
--- a/stack.sh
+++ b/stack.sh
@@ -860,6 +860,7 @@
fi
if is_service_enabled heat; then
install_heat
+ install_heatclient
fi
if is_service_enabled cinder; then
install_cinder
@@ -915,6 +916,7 @@
fi
if is_service_enabled heat; then
configure_heat
+ configure_heatclient
fi
if is_service_enabled cinder; then
configure_cinder
diff --git a/stackrc b/stackrc
index 283b271..5be872b 100644
--- a/stackrc
+++ b/stackrc
@@ -101,6 +101,10 @@
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