openstack/devstack
Code Issues Proposed changes

only do a dbsync if on the database node

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

Change-Id: Ibcfec0556829bff0938e3769c19d34ae6c02b738
This commit is contained in:
Sean Dague 2014-02-28 21:09:33 -05:00
parent 7083b8224d
commit c921a95f63
1 changed files with 5 additions and 3 deletions

8
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
}