diff --git a/manifests/proxy/ceilometer.pp b/manifests/proxy/ceilometer.pp index 29d070a1..6a8e4f59 100644 --- 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 index c0be2c2f..b2b962c3 100644 --- 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') }