openstack/devstack
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins
2014-03-01 18:54:57 +00:00
committed by Gerrit Code Review
parent 3de8607a4c c921a95f63
commit fe09741e14
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ceilometer
View File

@@ -180,10 +180,12 @@ function init_ceilometer {
sudo chown $STACK_USER $CEILOMETER_AUTH_CACHE_DIR sudo chown $STACK_USER $CEILOMETER_AUTH_CACHE_DIR
rm -f $CEILOMETER_AUTH_CACHE_DIR/* rm -f $CEILOMETER_AUTH_CACHE_DIR/*
if is_service_enabled mysql postgresql; then
if [ "$CEILOMETER_BACKEND" = 'mysql' ] || [ "$CEILOMETER_BACKEND" = 'postgresql' ] ; then if [ "$CEILOMETER_BACKEND" = 'mysql' ] || [ "$CEILOMETER_BACKEND" = 'postgresql' ] ; then
recreate_database ceilometer utf8 recreate_database ceilometer utf8
$CEILOMETER_BIN_DIR/ceilometer-dbsync $CEILOMETER_BIN_DIR/ceilometer-dbsync
fi fi
fi
} }
# install_ceilometer() - Collect source and prepare # install_ceilometer() - Collect source and prepare