From 2c14dcda0d975108ed8ec736e56b2878aaa99051 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Tue, 27 Oct 2020 00:37:37 +0900
Subject: [PATCH] Clean up deprecated parameters in the gnocchi::storage class

Change-Id: I4204d05b62af5f30eda92f10065c39883ecf4592
---
 manifests/init.pp                             | 11 ++----
 manifests/metricd.pp                          |  4 +-
 manifests/storage.pp                          | 37 +------------------
 ...move-storage-options-22a1f994f8713794.yaml |  9 +++++
 4 files changed, 16 insertions(+), 45 deletions(-)
 create mode 100644 releasenotes/notes/remove-storage-options-22a1f994f8713794.yaml

diff --git a/manifests/init.pp b/manifests/init.pp
index 641911b2..971649a6 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -35,18 +35,15 @@ class gnocchi (
     purge => $purge_config,
   }
 
-  $coordination_url_real = pick($::gnocchi::storage::coordination_url, $coordination_url)
-  $storage_package_ensure = pick($::gnocchi::storage::package_ensure, $package_ensure)
-
-  if $coordination_url_real {
+  if $coordination_url {
 
     gnocchi_config {
-      'DEFAULT/coordination_url' : value => $coordination_url_real;
+      'DEFAULT/coordination_url' : value => $coordination_url;
     }
 
-    if ($coordination_url_real =~ /^redis/ ) {
+    if ($coordination_url =~ /^redis/ ) {
       ensure_resource('package', 'python-redis', {
-        ensure => $storage_package_ensure,
+        ensure => $package_ensure,
         name   => $::gnocchi::params::redis_package_name,
         tag    => 'openstack',
       })
diff --git a/manifests/metricd.pp b/manifests/metricd.pp
index 002cdb6a..d6b37743 100644
--- a/manifests/metricd.pp
+++ b/manifests/metricd.pp
@@ -38,12 +38,10 @@ class gnocchi::metricd (
 
   include gnocchi::deps
 
-  $metric_processing_delay_real = pick($::gnocchi::storage::metric_processing_delay, $metric_processing_delay)
-
   gnocchi_config {
     'metricd/workers':                 value => $workers;
     'metricd/metric_cleanup_delay':    value => $cleanup_delay;
-    'metricd/metric_processing_delay': value => $metric_processing_delay_real;
+    'metricd/metric_processing_delay': value => $metric_processing_delay;
   }
 
   package { 'gnocchi-metricd':
diff --git a/manifests/storage.pp b/manifests/storage.pp
index 85c29a07..08dd7819 100644
--- a/manifests/storage.pp
+++ b/manifests/storage.pp
@@ -13,44 +13,11 @@
 # gnocchi::storage
 #
 # Storage backend for Gnocchi
+# This class currently has no effect but is kept as a placeholder.
 #
 # == Parameters
 #
-# DEPRECATED PARAMETERS
-#
-# [*package_ensure*]
-#   (optional) ensure state for package.
-#   Defaults to 'present'
-#
-# [*coordination_url*]
-#   (optional) The url to use for distributed group membership coordination.
-#   Defaults to undef
-#
-# [*metric_processing_delay*]
-#   (optional) Delay between processng metrics
-#   Defaults to undef
-#
 class gnocchi::storage(
-  # DEPRECATED PARAMETERS
-  $package_ensure          = undef,
-  $coordination_url        = undef,
-  $metric_processing_delay = undef,
-) inherits gnocchi::params {
-
+) {
   include gnocchi::deps
-
-  if $package_ensure {
-    warning('The gnocchi::storage::package_ensure parameter was deprecated. \
-Use gnocchi::package_ensure instead')
-  }
-
-  if $coordination_url {
-    warning('The gnocchi::storage::coordination_url parameter was deprecated. \
-Use gnocchi::coordination_url instead')
-  }
-
-  if $metric_processing_delay {
-    warning('The gnocchi::storage::metric_processing_delay parameter was deprecated. \
-Use gnocchi::metricd::metric_processing_delay instead')
-  }
 }
diff --git a/releasenotes/notes/remove-storage-options-22a1f994f8713794.yaml b/releasenotes/notes/remove-storage-options-22a1f994f8713794.yaml
new file mode 100644
index 00000000..ecd42f9b
--- /dev/null
+++ b/releasenotes/notes/remove-storage-options-22a1f994f8713794.yaml
@@ -0,0 +1,9 @@
+---
+upgrade:
+  - |
+    The following parameters have been removed from the ``gnocchi::storage``
+    class.
+
+    - ``package_ensure``
+    - ``coordination_url``
+    - ``metric_processing_delay``