Merge "only do a dbsync if on the database node"

openstack · Mar 1, 2014 · fe09741 · fe09741
2 parents 3de8607 + c921a95
commit fe09741
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/lib/ceilometer b/lib/ceilometer
@@ -180,9 +180,11 @@ function init_ceilometer {
     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
 }