@@ -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