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

openstack-archive · Nov 7, 2020 · 55eafcb · 55eafcb
2 parents bd26572 + 74977e5
commit 55eafcb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/ci/environments/scenario001-standalone.yaml b/ci/environments/scenario001-standalone.yaml
@@ -55,7 +55,9 @@ parameter_defaults:
   EventPipelinePublishers:
     - gnocchi://?archive_policy=ceilometer-high-rate
   CeilometerQdrPublishEvents: true
+  CeilometerQdrPublishMetrics: true
   ManageEventPipeline: true
+  ManagePipeline: true
 
   Debug: true
   CephAnsibleDisksConfig:

diff --git a/environments/enable-stf.yaml b/environments/enable-stf.yaml
@@ -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

diff --git a/environments/metrics/ceilometer-write-qdr.yaml b/environments/metrics/ceilometer-write-qdr.yaml
@@ -9,4 +9,5 @@ resource_registry:
   OS::TripleO::Services::Redis: ../../deployment/database/redis-pacemaker-puppet.yaml
 
 parameter_defaults:
-  CeilometerQdrPublish: true
+  CeilometerQdrPublishEvents: true
+  CeilometerQdrPublisMetrics: true