From a6ece88f9f91f487c20fa66abb049ceb6847e696 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Sun, 12 Sep 2021 22:00:35 +0900
Subject: [PATCH] Remove parameters for the Spares Pool feature

... because these were deprecated during Wallaby cycle[1]. Actual
implementation was also removed from Octavia during Xena cycle[2].

[1] 46cffbd1e9229f587f3b6c703f4964aec4bab452
[2] 815a283823121d563562474eb9048673a95f6e1f

Change-Id: Ia516256b9a1acc7790bfaf58c1f17e558fe4a139
---
 manifests/housekeeping.pp                     | 35 -------------------
 ...-spares-pool-feature-2ed29ea73a2454aa.yaml |  7 ++++
 spec/classes/octavia_housekeeping_spec.rb     | 14 +++-----
 3 files changed, 12 insertions(+), 44 deletions(-)
 create mode 100644 releasenotes/notes/remove-spares-pool-feature-2ed29ea73a2454aa.yaml

diff --git a/manifests/housekeeping.pp b/manifests/housekeeping.pp
index d3bba576..c8f168ae 100644
--- a/manifests/housekeeping.pp
+++ b/manifests/housekeeping.pp
@@ -38,16 +38,6 @@
 #   (optional) Number of threads performing amphora certificate rotation.
 #   Defaults to $::os_service_default
 #
-# DEPRECATED PARAMETERS
-#
-# [*spare_check_interval*]
-#   (optional) spare check interval in seconds.
-#   Defaults to undef
-#
-# [*spare_amphora_pool_size*]
-#   (optional) Number of spare amphora.
-#   Defaults to undef
-#
 class octavia::housekeeping (
   $manage_service            = true,
   $enabled                   = true,
@@ -58,9 +48,6 @@ class octavia::housekeeping (
   $cert_interval             = $::os_service_default,
   $cert_expiry_buffer        = $::os_service_default,
   $cert_rotate_threads       = $::os_service_default,
-  # DEPRECATED PARAMETERS
-  $spare_check_interval      = undef,
-  $spare_amphora_pool_size   = undef,
 ) inherits octavia::params {
 
   include octavia::deps
@@ -96,26 +83,4 @@ class octavia::housekeeping (
     'house_keeping/cert_expiry_buffer'         : value => $cert_expiry_buffer;
     'house_keeping/cert_rotate_threads'        : value => $cert_rotate_threads;
   }
-
-  if $spare_check_interval != undef {
-    warning('The spare_check_interval is deprecated and will be removed in a future release')
-    octavia_config {
-      'house_keeping/spare_check_interval': value => $spare_check_interval;
-    }
-  } else {
-    octavia_config {
-      'house_keeping/spare_check_interval': value => $::os_service_default;
-    }
-  }
-
-  if $spare_amphora_pool_size != undef {
-    warning('The spare_amphora_pool_size is deprecated and will be removed in a future release')
-    octavia_config {
-      'house_keeping/spare_amphora_pool_size' : value => $spare_amphora_pool_size;
-    }
-  } else {
-    octavia_config {
-      'house_keeping/spare_amphora_pool_size' : value => $::os_service_default;
-    }
-  }
 }
diff --git a/releasenotes/notes/remove-spares-pool-feature-2ed29ea73a2454aa.yaml b/releasenotes/notes/remove-spares-pool-feature-2ed29ea73a2454aa.yaml
new file mode 100644
index 00000000..ccd14c61
--- /dev/null
+++ b/releasenotes/notes/remove-spares-pool-feature-2ed29ea73a2454aa.yaml
@@ -0,0 +1,7 @@
+---
+upgrade:
+  - |
+    The following parameters in the ``octavia::housekeeping`` class have been
+    removed.
+    - ``spare_check_interval``
+    - ``spare_amphora_pool_size``
diff --git a/spec/classes/octavia_housekeeping_spec.rb b/spec/classes/octavia_housekeeping_spec.rb
index f21054cf..5abb864a 100644
--- a/spec/classes/octavia_housekeeping_spec.rb
+++ b/spec/classes/octavia_housekeeping_spec.rb
@@ -20,17 +20,14 @@ describe 'octavia::housekeeping' do
     end
 
     context 'check parameters with defaults' do
-      ['spare_check_interval', 'spare_amphora_pool_size', 'cleanup_interval',
-       'amphora_expiry_age', 'load_balancer_expiry_age', 'cert_interval',
-       'cert_expiry_buffer', 'cert_rotate_threads'].each do |param_with_default|
+      ['cleanup_interval', 'amphora_expiry_age', 'load_balancer_expiry_age',
+       'cert_interval', 'cert_expiry_buffer', 'cert_rotate_threads'].each do |param_with_default|
          it { is_expected.to contain_octavia_config("house_keeping/#{param_with_default}").with_value('<SERVICE DEFAULT>') }
       end
     end
 
     let :default_parameters do
-      { :spare_check_interval      => 60,
-        :spare_amphora_pool_size   => 20,
-        :cleanup_interval          => 26,
+      { :cleanup_interval          => 26,
         :amphora_expiry_age        => 200000,
         :load_balancer_expiry_age  => 23131,
         :cert_interval             => 200,
@@ -43,9 +40,8 @@ describe 'octavia::housekeeping' do
       before :each do
         params.merge!(default_parameters)
       end
-      ['spare_check_interval', 'spare_amphora_pool_size', 'cleanup_interval',
-       'amphora_expiry_age', 'load_balancer_expiry_age', 'cert_interval',
-       'cert_expiry_buffer', 'cert_rotate_threads'].each do |param_with_default|
+      ['cleanup_interval', 'amphora_expiry_age', 'load_balancer_expiry_age',
+       'cert_interval', 'cert_expiry_buffer', 'cert_rotate_threads'].each do |param_with_default|
          it { is_expected.to contain_octavia_config("house_keeping/#{param_with_default}").with_value(default_parameters[param_with_default.to_sym]) }
       end
     end