From 13344bd975b01cbfce6017f91e14964cf03a47be Mon Sep 17 00:00:00 2001
From: Joe Gordon <joe.gordon0@gmail.com>
Date: Tue, 22 Jul 2014 14:26:05 -0700
Subject: [PATCH] Fix install_ceilometer and install_ceilometerclient

Other projects do a setup_develop in install_*. This standard is used by
grenade to do installations. Currently grenade uses install ceilometer
as part of the upgrade script, but this doesn't actually install the new
ceilometer.

Change-Id: I4e44bec6574e6a4fcfc252418bc267191aef28fb
Closes-Bug: #1347178
---
 lib/ceilometer | 12 ++++--------
 stack.sh       |  1 -
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/lib/ceilometer b/lib/ceilometer
index 1540e3eb2c..4053caee4e 100644
--- a/lib/ceilometer
+++ b/lib/ceilometer
@@ -113,16 +113,8 @@ function cleanup_ceilometer {
     fi
 }
 
-# configure_ceilometerclient() - Set config files, create data dirs, etc
-function configure_ceilometerclient {
-    setup_develop $CEILOMETERCLIENT_DIR
-    sudo install -D -m 0644 -o $STACK_USER {$CEILOMETERCLIENT_DIR/tools/,/etc/bash_completion.d/}ceilometer.bash_completion
-}
-
 # configure_ceilometer() - Set config files, create data dirs, etc
 function configure_ceilometer {
-    setup_develop $CEILOMETER_DIR
-
     [ ! -d $CEILOMETER_CONF_DIR ] && sudo mkdir -m 755 -p $CEILOMETER_CONF_DIR
     sudo chown $STACK_USER $CEILOMETER_CONF_DIR
 
@@ -218,11 +210,15 @@ function init_ceilometer {
 # install_ceilometer() - Collect source and prepare
 function install_ceilometer {
     git_clone $CEILOMETER_REPO $CEILOMETER_DIR $CEILOMETER_BRANCH
+    setup_develop $CEILOMETER_DIR
+
 }
 
 # install_ceilometerclient() - Collect source and prepare
 function install_ceilometerclient {
     git_clone $CEILOMETERCLIENT_REPO $CEILOMETERCLIENT_DIR $CEILOMETERCLIENT_BRANCH
+    setup_develop $CEILOMETERCLIENT_DIR
+    sudo install -D -m 0644 -o $STACK_USER {$CEILOMETERCLIENT_DIR/tools/,/etc/bash_completion.d/}ceilometer.bash_completion
 }
 
 # start_ceilometer() - Start running processes, including screen
diff --git a/stack.sh b/stack.sh
index 6d816919e9..1f1409df9a 100755
--- a/stack.sh
+++ b/stack.sh
@@ -796,7 +796,6 @@ if is_service_enabled ceilometer; then
     install_ceilometer
     echo_summary "Configuring Ceilometer"
     configure_ceilometer
-    configure_ceilometerclient
 fi
 
 if is_service_enabled heat; then