Browse code

Install and configure python-heatclient.

This uses the new REST API. It installs a client executable called 'heat'.
The old heat client in the heat repo has been renamed to heat-cfn.

Change-Id: I7bc8662c531e3639cc940a44df96ff426ac3aada

Steve Baker authored on 2012/11/05 05:57:57
Showing 3 changed files
... ...
@@ -23,7 +23,7 @@ set +o xtrace
23 23
 # Defaults
24 24
 # --------
25 25
 HEAT_DIR=$DEST/heat
26
-
26
+HEATCLIENT_DIR=$DEST/python-heatclient
27 27
 # set up default directories
28 28
 
29 29
 # cleanup_heat() - Remove residual data files, anything left over from previous
... ...
@@ -33,6 +33,11 @@ function cleanup_heat() {
33 33
     :
34 34
 }
35 35
 
36
+# configure_heatclient() - Set config files, create data dirs, etc
37
+function configure_heatclient() {
38
+    setup_develop $HEATCLIENT_DIR
39
+}
40
+
36 41
 # configure_heat() - Set config files, create data dirs, etc
37 42
 function configure_heat() {
38 43
     setup_develop $HEAT_DIR
... ...
@@ -193,6 +198,11 @@ function init_heat() {
193 193
     $HEAT_DIR/tools/nova_create_flavors.sh
194 194
 }
195 195
 
196
+# install_heatclient() - Collect source and prepare
197
+function install_heatclient() {
198
+    git_clone $HEATCLIENT_REPO $HEATCLIENT_DIR $HEATCLIENT_BRANCH
199
+}
200
+
196 201
 # install_heat() - Collect source and prepare
197 202
 function install_heat() {
198 203
     git_clone $HEAT_REPO $HEAT_DIR $HEAT_BRANCH
... ...
@@ -852,6 +852,7 @@ if is_service_enabled quantum; then
852 852
 fi
853 853
 if is_service_enabled heat; then
854 854
     install_heat
855
+    install_heatclient
855 856
 fi
856 857
 if is_service_enabled cinder; then
857 858
     install_cinder
... ...
@@ -906,6 +907,7 @@ if is_service_enabled quantum; then
906 906
 fi
907 907
 if is_service_enabled heat; then
908 908
     configure_heat
909
+    configure_heatclient
909 910
 fi
910 911
 if is_service_enabled cinder; then
911 912
     configure_cinder
... ...
@@ -101,6 +101,10 @@ TEMPEST_BRANCH=master
101 101
 HEAT_REPO=${GIT_BASE}/heat-api/heat.git
102 102
 HEAT_BRANCH=master
103 103
 
104
+# python heat client library
105
+HEATCLIENT_REPO=${GIT_BASE}/heat-api/python-heatclient.git
106
+HEATCLIENT_BRANCH=master
107
+
104 108
 # ryu service
105 109
 RYU_REPO=https://github.com/osrg/ryu.git
106 110
 RYU_BRANCH=master