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 2f47252b8e)
This commit is contained in:
Martin Magr 2020-02-26 20:37:21 +01:00
parent ecc9bee214
commit 26e4309ac5
2 changed files with 3 additions and 2 deletions

View File

@ -6,6 +6,7 @@ resource_registry:
OS::TripleO::Services::CeilometerAgentNotification: ../../docker/services/ceilometer-agent-notification.yaml OS::TripleO::Services::CeilometerAgentNotification: ../../docker/services/ceilometer-agent-notification.yaml
OS::TripleO::Services::CeilometerAgentIpmi: ../../docker/services/ceilometer-agent-ipmi.yaml OS::TripleO::Services::CeilometerAgentIpmi: ../../docker/services/ceilometer-agent-ipmi.yaml
OS::TripleO::Services::ComputeCeilometerAgent: ../../docker/services/ceilometer-agent-compute.yaml OS::TripleO::Services::ComputeCeilometerAgent: ../../docker/services/ceilometer-agent-compute.yaml
OS::TripleO::Services::Redis: ../../docker/services/database/redis.yaml
parameter_defaults: parameter_defaults:
CeilometerEnablePanko: false CeilometerEnablePanko: false

View File

@ -55,13 +55,13 @@ parameters:
CeilometerQdrEventsConfig: CeilometerQdrEventsConfig:
default: default:
driver: amqp driver: amqp
topic: ceilometer/event.sample topic: event
description: Configuration for notifier publisher for events. description: Configuration for notifier publisher for events.
type: json type: json
CeilometerQdrMetricsConfig: CeilometerQdrMetricsConfig:
default: default:
driver: amqp driver: amqp
topic: ceilometer/metering.sample topic: metering
description: Configuration for notifier publisher for metrics. description: Configuration for notifier publisher for metrics.
type: json type: json
ManageEventPipeline: ManageEventPipeline: