From 26e4309ac57087d71187f3063f56730163dd9c33 Mon Sep 17 00:00:00 2001 From: Martin Magr Date: Wed, 26 Feb 2020 20:37:21 +0100 Subject: [PATCH] Remove duplicated topic parts from default value Ceilometer is adding the topic prefix and suffix automatically, which makes the resulting topic have the 'ceilometer/' prefix and '.sample' suffix duplicated. This patch also adds comment to ceilometer env to ensure user deploys Redis for coordination. Change-Id: I26027cd9b9eb1d166eae52021b1aef9d82a975f3 (cherry picked from commit 2f47252b8e2361343573b20d95172631b4f4f359) --- environments/metrics/ceilometer-write-qdr.yaml | 1 + puppet/services/ceilometer-agent-notification.yaml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/environments/metrics/ceilometer-write-qdr.yaml b/environments/metrics/ceilometer-write-qdr.yaml index 4df3059241..1f3e6b4aa7 100644 --- a/environments/metrics/ceilometer-write-qdr.yaml +++ b/environments/metrics/ceilometer-write-qdr.yaml @@ -6,6 +6,7 @@ resource_registry: OS::TripleO::Services::CeilometerAgentNotification: ../../docker/services/ceilometer-agent-notification.yaml OS::TripleO::Services::CeilometerAgentIpmi: ../../docker/services/ceilometer-agent-ipmi.yaml OS::TripleO::Services::ComputeCeilometerAgent: ../../docker/services/ceilometer-agent-compute.yaml + OS::TripleO::Services::Redis: ../../docker/services/database/redis.yaml parameter_defaults: CeilometerEnablePanko: false diff --git a/puppet/services/ceilometer-agent-notification.yaml b/puppet/services/ceilometer-agent-notification.yaml index 793faa94b1..7a8db287d9 100644 --- a/puppet/services/ceilometer-agent-notification.yaml +++ b/puppet/services/ceilometer-agent-notification.yaml @@ -55,13 +55,13 @@ parameters: CeilometerQdrEventsConfig: default: driver: amqp - topic: ceilometer/event.sample + topic: event description: Configuration for notifier publisher for events. type: json CeilometerQdrMetricsConfig: default: driver: amqp - topic: ceilometer/metering.sample + topic: metering description: Configuration for notifier publisher for metrics. type: json ManageEventPipeline: