ceilometer: Fix wrong rendering of ignore_projects

The ignore_projects option is not a multi-valued option but accepts only comma-separated strings. Change-Id: I7977ea4c84417078457afb0d0834934ba5481e5d (cherry picked from commit e751dda) (cherry picked from commit 642bd40)
openstack · Apr 27, 2024 · a78079f · a78079f
1 parent 134bce2
commit a78079f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/manifests/proxy/ceilometer.pp b/manifests/proxy/ceilometer.pp
@@ -222,7 +222,7 @@
     'filter:ceilometer/control_exchange':     value => $control_exchange;
     'filter:ceilometer/paste.filter_factory': value => 'ceilometermiddleware.swift:filter_factory';
     'filter:ceilometer/nonblocking_notify':   value => $nonblocking_notify;
-    'filter:ceilometer/ignore_projects':      value => $ignore_projects;
+    'filter:ceilometer/ignore_projects':      value => join(any2array($ignore_projects), ',');
     'filter:ceilometer/auth_url':             value => $auth_url;
     'filter:ceilometer/auth_type':            value => $auth_type;
     'filter:ceilometer/project_name':         value => $project_name_real;

diff --git a/spec/classes/swift_proxy_ceilometer_spec.rb b/spec/classes/swift_proxy_ceilometer_spec.rb
@@ -35,7 +35,7 @@
           :topic                 => 'notifications',
           :control_exchange      => 'swift',
           :nonblocking_notify    => true,
-          :ignore_projects       => ['services'],
+          :ignore_projects       => ['services', 'admin'],
           :auth_url              => 'http://127.0.0.1:5000',
           :auth_type             => 'password',
           :project_domain_name   => 'Default',
@@ -54,7 +54,7 @@
         it { is_expected.to contain_swift_proxy_config('filter:ceilometer/topic').with_value('notifications') }
         it { is_expected.to contain_swift_proxy_config('filter:ceilometer/control_exchange').with_value('swift') }
         it { is_expected.to contain_swift_proxy_config('filter:ceilometer/nonblocking_notify').with_value('true') }
-        it { is_expected.to contain_swift_proxy_config('filter:ceilometer/ignore_projects').with_value(['services']) }
+        it { is_expected.to contain_swift_proxy_config('filter:ceilometer/ignore_projects').with_value('services,admin') }
         it { is_expected.to contain_swift_proxy_config('filter:ceilometer/auth_url').with_value('http://127.0.0.1:5000') }
         it { is_expected.to contain_swift_proxy_config('filter:ceilometer/auth_type').with_value('password') }
         it { is_expected.to contain_swift_proxy_config('filter:ceilometer/project_name').with_value('services') }