]> review.fuel-infra Code Review - puppet-modules/puppet-ceilometer.git/commitdiff
fix filter_project param values
authorPradeep Kilambi <pkilambi@redhat.com>
Wed, 17 Feb 2016 19:48:40 +0000 (14:48 -0500)
committerEmilien Macchi <emilien@redhat.com>
Wed, 9 Mar 2016 00:06:54 +0000 (00:06 +0000)
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
spec/classes/ceilometer_dispatcher_gnocchi_spec.rb

index be8132ef008d203cbd3af9cca2cab6eb851bfcf0..bf47a61702818df919b87a440be74ead2808b798 100644 (file)
@@ -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',
index d9e71c9a68e99190186560cde8fadf3d0299c3bf..96d5dcbf819f8ec1e720128101c4d8cfd5c1b925 100644 (file)
@@ -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') }