From cac2b26d06efafce34b2b224bbab8ec9f93e113a Mon Sep 17 00:00:00 2001 From: Chris Dent Date: Tue, 13 Oct 2015 10:02:08 +0100 Subject: [PATCH] Do collector setup and storage cleanup for all backends It appears that a bit of overzealous copy and pasting of commands has meant that: * the number of collectors was not being set for mongodb, which may be a cause of performance issues in the gate * the cleanup was not being called for the sql backend, which leaves behind wsgi config files when that backend is chosen Change-Id: I013f14f8b167e564f794333c0fe5c8f421bb25a9 --- devstack/plugin.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 8600ad06..c1c456a3 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -213,23 +213,20 @@ function _ceilometer_configure_storage_backend { 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 collector workers $API_WORKERS elif [ "$CEILOMETER_BACKEND" = 'es' ] ; then # es is only supported for events. we will use sql for alarming/metering. iniset $CEILOMETER_CONF database alarm_connection $(database_connection_url ceilometer) iniset $CEILOMETER_CONF database event_connection es://localhost:9200 iniset $CEILOMETER_CONF database metering_connection $(database_connection_url ceilometer) - iniset $CEILOMETER_CONF collector workers $API_WORKERS ${TOP_DIR}/pkg/elasticsearch.sh start - cleanup_ceilometer elif [ "$CEILOMETER_BACKEND" = 'mongodb' ] ; then 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 - cleanup_ceilometer else die $LINENO "Unable to configure unknown CEILOMETER_BACKEND $CEILOMETER_BACKEND" fi + cleanup_ceilometer } # Configure Ceilometer @@ -285,6 +282,7 @@ function configure_ceilometer { # Configure storage _ceilometer_configure_storage_backend + iniset $CEILOMETER_CONF collector workers $API_WORKERS if [[ "$VIRT_DRIVER" = 'vsphere' ]]; then iniset $CEILOMETER_CONF DEFAULT hypervisor_inspector vsphere