Merge "Enable Ceilometer data transfer for STF" into stable/ussuri

This commit is contained in:
Zuul 2020-11-07 03:24:23 +00:00 committed by Gerrit Code Review
commit 55eafcb8a7
3 changed files with 9 additions and 7 deletions

View File

@ -55,7 +55,9 @@ parameter_defaults:
EventPipelinePublishers:
- gnocchi://?archive_policy=ceilometer-high-rate
CeilometerQdrPublishEvents: true
CeilometerQdrPublishMetrics: true
ManageEventPipeline: true
ManagePipeline: true
Debug: true
CephAnsibleDisksConfig:

View File

@ -3,14 +3,13 @@ resource_registry:
OS::TripleO::Services::Collectd: ../deployment/metrics/collectd-container-puppet.yaml
OS::TripleO::Services::MetricsQdr: ../deployment/metrics/qdr-container-puppet.yaml
OS::TripleO::Services::Redis: ../deployment/database/redis-pacemaker-puppet.yaml
# We want these when smartgateway is able to process ceilometer messages
# OS::TripleO::Services::CeilometerAgentCentral: ../deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml
# OS::TripleO::Services::CeilometerAgentNotification: ../deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml
# OS::TripleO::Services::ComputeCeilometerAgent: ../deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml
OS::TripleO::Services::CeilometerAgentCentral: ../deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml
OS::TripleO::Services::CeilometerAgentNotification: ../deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml
OS::TripleO::Services::ComputeCeilometerAgent: ../deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml
parameter_defaults:
# Uncomment when smartgateway can handle ceilometer messages
# CeilometerQdrPublish: true
CeilometerQdrPublishEvents: true
CeilometerQdrPublishMetrics: true
EnableSTF: true
CollectdConnectionType: amqp1
CollectdAmqpInterval: 5

View File

@ -9,4 +9,5 @@ resource_registry:
OS::TripleO::Services::Redis: ../../deployment/database/redis-pacemaker-puppet.yaml
parameter_defaults:
CeilometerQdrPublish: true
CeilometerQdrPublishEvents: true
CeilometerQdrPublisMetrics: true