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

View File

@ -44,6 +44,7 @@ parameter_defaults:
# instead of 10 minutes. Note that tempest telemetry.alarm_granularity must
# in sync with the archive policy, 60s too.
ceilometer::agent::polling::polling_interval: 15
tripleo::profile::base::metrics::qdr::interior_mesh_nodes: ''
ManagePolling: true
HeatConfigureDelegatedRoles: true
ManagePipeline: true

View File

@ -61,13 +61,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:

View File

@ -6,6 +6,7 @@ resource_registry:
OS::TripleO::Services::CeilometerAgentNotification: ../../deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml
OS::TripleO::Services::CeilometerAgentIpmi: ../../deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml
OS::TripleO::Services::ComputeCeilometerAgent: ../../deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml
OS::TripleO::Services::Redis: ../../deployment/database/redis-pacemaker-puppet.yaml
parameter_defaults:
CeilometerQdrPublish: true