From 4416b78e14bbd0047193d6fa6affed39b40cdd1d Mon Sep 17 00:00:00 2001
From: Yadnesh Kulkarni <yadnesh_kulkarni@proton.me>
Date: Fri, 25 Aug 2023 11:27:59 +0530
Subject: [PATCH] Set 'tenant_name_discovery' parameter in 'polling' section

As of now 'tenant_name_discovery'[1] is being configured in 'DEFAULT' section in ceilometer config file.

As per Ceilometer this must be configured as a polling option[2].

[1] https://github.com/openstack/ceilometer/blob/master/ceilometer/polling/manager.py#L69-L80
[2] https://github.com/openstack/ceilometer/blob/master/ceilometer/opts.py#L98

Change-Id: Ib5c273df325f5ed0dccf7f45a9c7a91aba9568c3
---
 manifests/agent/polling.pp                    | 2 +-
 spec/classes/ceilometer_agent_polling_spec.rb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifests/agent/polling.pp b/manifests/agent/polling.pp
index e30164d3..3bf8bd57 100644
--- a/manifests/agent/polling.pp
+++ b/manifests/agent/polling.pp
@@ -209,7 +209,7 @@ class ceilometer::agent::polling (
 
   ceilometer_config {
     'polling/batch_size':            value => $batch_size;
-    'DEFAULT/tenant_name_discovery': value => $tenant_name_discovery;
+    'polling/tenant_name_discovery': value => $tenant_name_discovery;
   }
 
   if $manage_service {
diff --git a/spec/classes/ceilometer_agent_polling_spec.rb b/spec/classes/ceilometer_agent_polling_spec.rb
index 5543fb63..e6383f7a 100644
--- a/spec/classes/ceilometer_agent_polling_spec.rb
+++ b/spec/classes/ceilometer_agent_polling_spec.rb
@@ -72,7 +72,7 @@ describe 'ceilometer::agent::polling' do
 
       it { should contain_ceilometer_config('polling/batch_size').with_value('<SERVICE DEFAULT>') }
       it { should_not contain_file('polling') }
-      it { should contain_ceilometer_config('DEFAULT/tenant_name_discovery').with_value('<SERVICE DEFAULT>') }
+      it { should contain_ceilometer_config('polling/tenant_name_discovery').with_value('<SERVICE DEFAULT>') }
     end
 
     context 'when setting package_ensure' do
@@ -109,7 +109,7 @@ describe 'ceilometer::agent::polling' do
       end
 
       it {
-        should contain_ceilometer_config('DEFAULT/tenant_name_discovery').with_value(true)
+        should contain_ceilometer_config('polling/tenant_name_discovery').with_value(true)
       }
     end