commit bc84cdf4877bf61c5b684dc01e4ef9b77bb3e4be
author Jenkins <jenkins@review.openstack.org> Sat Jul 27 15:57:35 2013 +0000
committer Gerrit Code Review <review@openstack.org> Sat Jul 27 15:57:35 2013 +0000
tree c2dd6d286cc642dc60fe8b6c569a7ed612979461
parent fa6d0c06cc23d92580d76a987dfdd45c4cca8e99
parent 75195b58cc27bf415594235e1e36ec7cd8223321

Merge "ensure all horizon needed clients are installed from git"

stack.sh

diff --git a/stack.sh b/stack.sh
index 5d76bc2..4e23505 100755
--- a/stack.sh
+++ b/stack.sh
@@ -666,12 +666,15 @@
 install_glanceclient
 install_cinderclient
 install_novaclient
-if is_service_enabled swift glance; then
+if is_service_enabled swift glance horizon; then
     install_swiftclient
 fi
-if is_service_enabled neutron nova; then
+if is_service_enabled neutron nova horizon; then
     install_neutronclient
 fi
+if is_service_enabled heat horizon; then
+    install_heatclient
+fi
 
 git_clone $OPENSTACKCLIENT_REPO $OPENSTACKCLIENT_DIR $OPENSTACKCLIENT_BRANCH
 setup_develop $OPENSTACKCLIENT_DIR
@@ -742,7 +745,6 @@
 fi
 
 if is_service_enabled heat; then
-    install_heatclient
     install_heat
     cleanup_heat
     configure_heat