summaryrefslogtreecommitdiff
path: root/devstack
diff options
context:
space:
mode:
authorJulien Danjou <julien@danjou.info>2017-09-04 13:47:58 +0200
committerJulien Danjou <julien@danjou.info>2017-10-13 18:18:07 +0200
commit83ffaffcb2cee6a0b19601bc7cefd863685601e2 (patch)
treed28beb0e51bb65ee856ce9dcfd28b63c89371745 /devstack
parentbca9d45ea439220305539f85a653cb31e501be25 (diff)
downloadceilometer-83ffaffcb2cee6a0b19601bc7cefd863685601e2.tar.gz
Replace the Gnocchi dispatcher by a publisher
This removes the deprecated Gnocchi dispatcher and replaces it by its equivalent publisher. Change-Id: Ie44baf20ccb8de5794f5f0c3d4717f7e56afa63b
Diffstat (limited to 'devstack')
-rw-r--r--devstack/plugin.sh8
1 files changed, 1 insertions, 7 deletions
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 608ce2f3..8aa6b53a 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -299,13 +299,7 @@ function _ceilometer_configure_storage_backend {
# NOTE(gordc): set batching to better handle recording on a slow machine
iniset $CEILOMETER_CONF collector batch_size 50
iniset $CEILOMETER_CONF collector batch_timeout 5
- iniset $CEILOMETER_CONF dispatcher_gnocchi archive_policy ${GNOCCHI_ARCHIVE_POLICY}
- if is_service_enabled swift && [[ "$GNOCCHI_STORAGE_BACKEND" = 'swift' ]] ; then
- iniset $CEILOMETER_CONF dispatcher_gnocchi filter_service_activity "True"
- iniset $CEILOMETER_CONF dispatcher_gnocchi filter_project "gnocchi_swift"
- else
- iniset $CEILOMETER_CONF dispatcher_gnocchi filter_service_activity "False"
- fi
+ sed -i "s/gnocchi:\/\//gnocchi:\/\/?archive_policy=${GNOCCHI_ARCHIVE_POLICY}\&filter_project=gnocchi_swift/" $CEILOMETER_CONF_DIR/event_pipeline.yaml $CEILOMETER_CONF_DIR/pipeline.yaml
else
die $LINENO "Unable to configure unknown CEILOMETER_BACKEND $CEILOMETER_BACKEND"
fi