Browse Source

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)
changes/18/728418/1
Martin Magr 1 year ago
parent
commit
26e4309ac5
2 changed files with 3 additions and 2 deletions
  1. +1
    -0
      environments/metrics/ceilometer-write-qdr.yaml
  2. +2
    -2
      puppet/services/ceilometer-agent-notification.yaml

+ 1
- 0
environments/metrics/ceilometer-write-qdr.yaml View File

@ -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


+ 2
- 2
puppet/services/ceilometer-agent-notification.yaml View File

@ -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:


Loading…
Cancel
Save