commit c921a95f63b00c549763c9968a103d44df590032
author Sean Dague <sean.dague@samsung.com> Fri Feb 28 21:09:33 2014 -0500
committer Sean Dague <sean.dague@samsung.com> Fri Feb 28 21:09:33 2014 -0500
tree 35de6a4354d6df65039e275f8423c16f15779378
parent 7083b8224dab423392e21b069a1a6ef54cd14a8f

only do a dbsync if on the database node

ceilometer should only try to reset the database if it's actually
on a node where there is a database.

Change-Id: Ibcfec0556829bff0938e3769c19d34ae6c02b738

lib/ceilometer

diff --git a/lib/ceilometer b/lib/ceilometer
index 0be4184..2e6e7c5 100644
--- a/lib/ceilometer
+++ b/lib/ceilometer
@@ -180,9 +180,11 @@
     sudo chown $STACK_USER $CEILOMETER_AUTH_CACHE_DIR
     rm -f $CEILOMETER_AUTH_CACHE_DIR/*
 
-    if [ "$CEILOMETER_BACKEND" = 'mysql' ] || [ "$CEILOMETER_BACKEND" = 'postgresql' ] ; then
-        recreate_database ceilometer utf8
-        $CEILOMETER_BIN_DIR/ceilometer-dbsync
+    if is_service_enabled mysql postgresql; then
+        if [ "$CEILOMETER_BACKEND" = 'mysql' ] || [ "$CEILOMETER_BACKEND" = 'postgresql' ] ; then
+            recreate_database ceilometer utf8
+            $CEILOMETER_BIN_DIR/ceilometer-dbsync
+        fi
     fi
 }