Skip to content

Commit 48bbfe9

Browse files
committed
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
1 parent 2d7f196 commit 48bbfe9

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

lib/ceilometer

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,10 +183,14 @@ function configure_ceilometer {
183183
configure_auth_token_middleware $CEILOMETER_CONF ceilometer $CEILOMETER_AUTH_CACHE_DIR
184184

185185
if [ "$CEILOMETER_BACKEND" = 'mysql' ] || [ "$CEILOMETER_BACKEND" = 'postgresql' ] ; then
186-
iniset $CEILOMETER_CONF database connection $(database_connection_url ceilometer)
186+
iniset $CEILOMETER_CONF database alarm_connection $(database_connection_url ceilometer)
187+
iniset $CEILOMETER_CONF database event_connection $(database_connection_url ceilometer)
188+
iniset $CEILOMETER_CONF database metering_connection $(database_connection_url ceilometer)
187189
iniset $CEILOMETER_CONF DEFAULT collector_workers $API_WORKERS
188190
else
189-
iniset $CEILOMETER_CONF database connection mongodb://localhost:27017/ceilometer
191+
iniset $CEILOMETER_CONF database alarm_connection mongodb://localhost:27017/ceilometer
192+
iniset $CEILOMETER_CONF database event_connection mongodb://localhost:27017/ceilometer
193+
iniset $CEILOMETER_CONF database metering_connection mongodb://localhost:27017/ceilometer
190194
configure_mongodb
191195
cleanup_ceilometer
192196
fi

0 commit comments

Comments
 (0)