Merge "Remove duplicated topic parts from default value"

This commit is contained in:
Zuul 2020-03-09 19:51:06 +00:00 committed by Gerrit Code Review
commit 96ece6b2b0
3 changed files with 4 additions and 2 deletions

View File

@ -45,6 +45,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