From 48bbfe93f5b4b600db0f12c1f8574d4177ccce36 Mon Sep 17 00:00:00 2001 From: gordon chung Date: Wed, 19 Nov 2014 15:54:17 -0500 Subject: [PATCH] switch to use ceilometer specific connections in Juno/Kilo, we added ceilometer purpose specific connections for: metering, alarms, event. Rather than piggyback off oslo.db's connection option (which gives misleading sql help message), we should use Ceilometer specific connections. Change-Id: I7703b73708a5807fb8de89fbb828f06b488acf69 --- lib/ceilometer | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/ceilometer b/lib/ceilometer index c4377e04c0..cdef422bb5 100644 --- a/lib/ceilometer +++ b/lib/ceilometer @@ -183,10 +183,14 @@ function configure_ceilometer { configure_auth_token_middleware $CEILOMETER_CONF ceilometer $CEILOMETER_AUTH_CACHE_DIR if [ "$CEILOMETER_BACKEND" = 'mysql' ] || [ "$CEILOMETER_BACKEND" = 'postgresql' ] ; then - iniset $CEILOMETER_CONF database connection $(database_connection_url ceilometer) + iniset $CEILOMETER_CONF database alarm_connection $(database_connection_url ceilometer) + iniset $CEILOMETER_CONF database event_connection $(database_connection_url ceilometer) + iniset $CEILOMETER_CONF database metering_connection $(database_connection_url ceilometer) iniset $CEILOMETER_CONF DEFAULT collector_workers $API_WORKERS else - iniset $CEILOMETER_CONF database connection mongodb://localhost:27017/ceilometer + iniset $CEILOMETER_CONF database alarm_connection mongodb://localhost:27017/ceilometer + iniset $CEILOMETER_CONF database event_connection mongodb://localhost:27017/ceilometer + iniset $CEILOMETER_CONF database metering_connection mongodb://localhost:27017/ceilometer configure_mongodb cleanup_ceilometer fi