Revert "deprecate dispatcher::gnocchi::archive_policy"

The upstream change has been reverted so lets revert this as well. See I4ee646088f7bc370ed7ffd1eb3b98e66bae6782e

This reverts commit 1a4bdd359d8b52989435440dd4629b598489bf59.

Change-Id: I017e8b4f7a064bc6cd3c283d1c115f3ecf1499fe

diff --git a/manifests/dispatcher/gnocchi.pp b/manifests/dispatcher/gnocchi.pp
index 46f50263c94911f774557e31a0f9e782fde4fafd..5ef0917255712fc74a3d9aba5c6599e387971a73 100644 (file)
--- a/manifests/dispatcher/gnocchi.pp
+++ b/manifests/dispatcher/gnocchi.pp
@@ -13,6 +13,10 @@
 #   generated by Gnocchi service activity
 #   Defaults to $::os_service_default.
 #
+# [*archive_policy*]
+#   (Optional) The archive policy to use when the dispatcher
+#   Defaults to $::os_service_default.
+#
 # [*resources_definition_file*]
 #   (Optional) The Yaml file that defines mapping between samples
 #   and gnocchi resources/metrics.
@@ -24,26 +28,18 @@
 #   (Optional) Gnocchi URL
 #   Defaults to undef
 #
-# [*archive_policy*]
-#   (Optional) The archive policy to use when the dispatcher
-#   Defaults to undef
-#
-#
 
 class ceilometer::dispatcher::gnocchi (
   $filter_service_activity   = $::os_service_default,
   $filter_project            = $::os_service_default,
+  $archive_policy            = $::os_service_default,
   $resources_definition_file = $::os_service_default,
   # DEPRECATED PARAMETERS
   $url                       = undef,
-  $archive_policy            = undef,
 ) {
 
   include ::ceilometer::deps
 
-  if $archive_policy {
-    warning('archive_policy parameter is deprecated, has no effect and will be removed in the Q release.')
-  }
   if $url {
     warning('url parameter is deprecated, has no effect and will be removed in the Q release.')
   }
@@ -51,6 +47,7 @@ class ceilometer::dispatcher::gnocchi (
   ceilometer_config {
     'dispatcher_gnocchi/filter_service_activity':   value => $filter_service_activity;
     'dispatcher_gnocchi/filter_project':            value => $filter_project;
+    'dispatcher_gnocchi/archive_policy':            value => $archive_policy;
     'dispatcher_gnocchi/resources_definition_file': value => $resources_definition_file;
   }
 

diff --git a/releasenotes/notes/gnocchi-dispatcher-archive-policy-a5b4101fe7c33532.yaml b/releasenotes/notes/gnocchi-dispatcher-archive-policy-a5b4101fe7c33532.yaml
deleted file mode 100644 (file)
index 2a29add..0000000
--- a/releasenotes/notes/gnocchi-dispatcher-archive-policy-a5b4101fe7c33532.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-deprecations:
-  - archive_policy option of ceilometer::dispatcher::gnocchi is now deprecated
-    for removal, the parameter has no effect.

diff --git a/spec/classes/ceilometer_dispatcher_gnocchi_spec.rb b/spec/classes/ceilometer_dispatcher_gnocchi_spec.rb
index f0b798fd3e81752dc7b130905dff30f8fabd26e4..c72c8db3265495f997fc1eb36d87df8c1164b4c8 100644 (file)
--- a/spec/classes/ceilometer_dispatcher_gnocchi_spec.rb
+++ b/spec/classes/ceilometer_dispatcher_gnocchi_spec.rb
@@ -14,6 +14,7 @@ describe 'ceilometer::dispatcher::gnocchi' do
     it 'configures gnocchi dispatcher' do
       is_expected.to contain_ceilometer_config('dispatcher_gnocchi/filter_service_activity').with_value('<SERVICE DEFAULT>')
       is_expected.to contain_ceilometer_config('dispatcher_gnocchi/filter_project').with_value('<SERVICE DEFAULT>')
+      is_expected.to contain_ceilometer_config('dispatcher_gnocchi/archive_policy').with_value('<SERVICE DEFAULT>')
       is_expected.to contain_ceilometer_config('dispatcher_gnocchi/resources_definition_file').with_value('<SERVICE DEFAULT>')
     end
 
@@ -21,10 +22,12 @@ describe 'ceilometer::dispatcher::gnocchi' do
       before do
         params.merge!(:filter_service_activity   => false,
                       :filter_project            => 'gnocchi_swift',
+                      :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('gnocchi_swift') }
+      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') }
     end
   end