From 9ac7d218d5935e8830bf0dd0bc585f58937bccd5 Mon Sep 17 00:00:00 2001 From: Pradeep Kilambi Date: Wed, 17 Feb 2016 14:48:40 -0500 Subject: [PATCH] fix filter_project param values Current examples and tests make it look like filter_project param is a boolean, which its not, Its a string instead. Change-Id: If5dbb0b1edd122a76dcc10d75f67d8f3a3fd0a7b --- examples/ceilometer_with_gnocchi.pp | 2 +- spec/classes/ceilometer_dispatcher_gnocchi_spec.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/ceilometer_with_gnocchi.pp b/examples/ceilometer_with_gnocchi.pp index be8132ef..bf47a617 100644 --- a/examples/ceilometer_with_gnocchi.pp +++ b/examples/ceilometer_with_gnocchi.pp @@ -33,7 +33,7 @@ class { '::ceilometer::collector': } class { '::ceilometer::dispatcher::gnocchi': filter_service_activity => false, - filter_project => true, + filter_project => 'gnocchi_swift', url => 'https://gnocchi:8041', archive_policy => 'high', resources_definition_file => 'gnocchi.yaml', diff --git a/spec/classes/ceilometer_dispatcher_gnocchi_spec.rb b/spec/classes/ceilometer_dispatcher_gnocchi_spec.rb index d9e71c9a..96d5dcbf 100644 --- a/spec/classes/ceilometer_dispatcher_gnocchi_spec.rb +++ b/spec/classes/ceilometer_dispatcher_gnocchi_spec.rb @@ -22,13 +22,13 @@ describe 'ceilometer::dispatcher::gnocchi' do context 'when overriding parameters' do before do params.merge!(:filter_service_activity => false, - :filter_project => true, + :filter_project => 'gnocchi_swift', :url => 'http://foo', :archive_policy => 'high', :resources_definition_file => 'foo') end it { is_expected.to contain_ceilometer_config('dispatcher_gnocchi/filter_service_activity').with_value('false') } - it { is_expected.to contain_ceilometer_config('dispatcher_gnocchi/filter_project').with_value('true') } + it { is_expected.to contain_ceilometer_config('dispatcher_gnocchi/filter_project').with_value('gnocchi_swift') } it { is_expected.to contain_ceilometer_config('dispatcher_gnocchi/url').with_value('http://foo') } it { is_expected.to contain_ceilometer_config('dispatcher_gnocchi/archive_policy').with_value('high') } it { is_expected.to contain_ceilometer_config('dispatcher_gnocchi/resources_definition_file').with_value('foo') }