commit c5259b4ab54841b8f9c4761d17b1c564fb88768c
author Doug Hellmann <doug.hellmann@dreamhost.com> Sat Sep 22 10:52:31 2012 -0400
committer Doug Hellmann <doug.hellmann@dreamhost.com> Sat Sep 22 10:52:31 2012 -0400
tree d252e0d83b1055e9eb0128e8aa88400642ddd542
parent 9dce274dac1a68074b61bfe392b3c55e186bb7dd

Fix test for creating ceilometer conf dir

Fix the test run before the ceilometer configuration
directory is created so that the dir is made if
it does not exist.

Change-Id: I2d6acd4fe7959f976ce99582aed69a49fc3f212e
Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>

lib/ceilometer

diff --git a/lib/ceilometer b/lib/ceilometer
index 0208753..568a544 100644
--- a/lib/ceilometer
+++ b/lib/ceilometer
@@ -48,10 +48,10 @@
 function configure_ceilometer() {
     setup_develop $CEILOMETER_DIR
 
-    [ -d $CEILOMETER_CONF_DIR ] && sudo mkdir -m 755 -p $CEILOMETER_CONF_DIR
+    [ ! -d $CEILOMETER_CONF_DIR ] && sudo mkdir -m 755 -p $CEILOMETER_CONF_DIR
     sudo chown $USER $CEILOMETER_CONF_DIR
 
-    [ ! -d $CEILOMETER_API_LOG_DIR ] &&  sudo mkdir -m 755 -p $CEILOMETER_API_LOG_DIR 
+    [ ! -d $CEILOMETER_API_LOG_DIR ] &&  sudo mkdir -m 755 -p $CEILOMETER_API_LOG_DIR
     sudo chown $USER $CEILOMETER_API_LOG_DIR
 
     # ceilometer confs are copy of /etc/nova/nova.conf which must exist first

stack.sh

diff --git a/stack.sh b/stack.sh
index 545c071..e0df6ec 100755
--- a/stack.sh
+++ b/stack.sh
@@ -2222,8 +2222,9 @@
     start_cinder
 fi
 if is_service_enabled ceilometer; then
-    echo_summary "Starting Ceilometer"
+    echo_summary "Configuring Ceilometer"
     configure_ceilometer
+    echo_summary "Starting Ceilometer"
     start_ceilometer
 fi
 screen_it horizon "cd $HORIZON_DIR && sudo tail -f /var/log/$APACHE_NAME/horizon_error.log"