From d4a924bb07d87e48fe45c81463a50f3d8c57e069 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Wed, 15 Feb 2023 16:45:32 +0900
Subject: [PATCH] Ceilometer: Test deployment with separate polling agents

puppet-ceilometer now supports deploying separate polling agents for
individual namespaces, in addition to the single polling agent.

This enables that new deployment architecture in scenario002 so that we
test both architectures.

Depends-on: https://review.opendev.org/c/openstack/puppet-ceilometer/+/856850
Change-Id: Ifdd5adef1e7cbb37e8ab3e3c2b3a860128b46821
---
 fixtures/scenario002.pp | 6 ++++--
 manifests/ceilometer.pp | 6 ++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/fixtures/scenario002.pp b/fixtures/scenario002.pp
index dba483852..b76b5da79 100644
--- a/fixtures/scenario002.pp
+++ b/fixtures/scenario002.pp
@@ -79,11 +79,13 @@ if $ec2api_enabled {
   include openstack_integration::ec2api
 }
 
-include openstack_integration::ceilometer
+class { 'openstack_integration::ceilometer':
+  separate_polling => true,
+}
 include openstack_integration::aodh
 class { 'openstack_integration::gnocchi':
   integration_enable => true,
-  backend            => 'swift'
+  backend            => 'swift',
 }
 
 class { 'openstack_integration::tempest':
diff --git a/manifests/ceilometer.pp b/manifests/ceilometer.pp
index c88c86969..b64e79afc 100644
--- a/manifests/ceilometer.pp
+++ b/manifests/ceilometer.pp
@@ -8,9 +8,14 @@
 #   (optional) Boolean to run integration tests.
 #   Defaults to true.
 #
+# [*separate_polling*]
+#   (optional) Use separate polling services for individual namespaces
+#   Defaults to false
+#
 class openstack_integration::ceilometer (
   $compute_namespace  = true,
   $integration_enable = true,
+  $separate_polling   = false,
 ){
 
   include openstack_integration::config
@@ -87,6 +92,7 @@ class openstack_integration::ceilometer (
       # NOTE(sileht): Use 1 minute instead 10 otherwise the telemetry tempest
       # tests are too long to pass in less than 1 hour.
       polling_interval  => 60,
+      separate_services => $separate_polling,
     }
   } else {
     # NOTE(tobias-urdin): When running the module tests we need to exclude the