openstack
/
ceilometer
Code Issues Proposed changes

Merge "collector: do not set any dispatcher by default"

This commit is contained in:
Jenkins 2016-10-11 20:49:01 +00:00 committed by Gerrit Code Review
parent c050e1acb5 8902dd1027
commit b3285fd19c
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ceilometer/dispatcher/__init__.py
View File

@ -28,7 +28,7 @@ LOG = log.getLogger(__name__)
OPTS = [
cfg.MultiStrOpt('meter_dispatchers',
deprecated_name='dispatcher',
default=['database'],
default=[],
help='Dispatchers to process metering data.'),
cfg.MultiStrOpt('event_dispatchers',
default=[],

2
devstack/plugin.sh
View File

@ -237,6 +237,7 @@ function _ceilometer_configure_cache_backend {
# Set configuration for storage backend.
function _ceilometer_configure_storage_backend {
if [ "$CEILOMETER_BACKEND" = 'mysql' ] || [ "$CEILOMETER_BACKEND" = 'postgresql' ] ; then
iniset $CEILOMETER_CONF DEFAULT meter_dispatchers database
iniset $CEILOMETER_CONF database event_connection $(database_connection_url ceilometer)
iniset $CEILOMETER_CONF database metering_connection $(database_connection_url ceilometer)
elif [ "$CEILOMETER_BACKEND" = 'es' ] ; then
@ -245,6 +246,7 @@ function _ceilometer_configure_storage_backend {
iniset $CEILOMETER_CONF database metering_connection $(database_connection_url ceilometer)
${TOP_DIR}/pkg/elasticsearch.sh start
elif [ "$CEILOMETER_BACKEND" = 'mongodb' ] ; then
iniset $CEILOMETER_CONF DEFAULT meter_dispatchers database
iniset $CEILOMETER_CONF database event_connection mongodb://localhost:27017/ceilometer
iniset $CEILOMETER_CONF database metering_connection mongodb://localhost:27017/ceilometer
elif [ "$CEILOMETER_BACKEND" = 'gnocchi' ] ; then