Merge "cache: Follow renaming of hashclient parameters"

manifests/cache.pp

@@ -202,12 +202,12 @@
 #   the HashClient's internal mechanisms.
 #   Default to $facts['os_service_default']
 #
-# [*hashclient_retry_delay*]
+# [*hashclient_retry_timeout*]
 #   (Optional) Time in seconds that should pass between
 #   retry attempts in the HashClient's internal mechanisms.
 #   Default to $facts['os_service_default']
 #
-# [*dead_timeout*]
+# [*hashclient_dead_timeout*]
 #   (Optional) Time in seconds before attempting to add a node
 #   back in the pool in the HashClient's internal mechanisms.
 #   Default to $facts['os_service_default']
@@ -245,6 +245,18 @@
 #   (Optional) Time to cache application credential data in seconds.
 #   Default to $facts['os_service_default']
 #
+# DEPRECATED PARAMETERS
+#
+# [*hashclient_retry_delay*]
+#   (Optional) Time in seconds that should pass between
+#   retry attempts in the HashClient's internal mechanisms.
+#   Default to undef
+#
+# [*dead_timeout*]
+#   (Optional) Time in seconds before attempting to add a node
+#   back in the pool in the HashClient's internal mechanisms.
+#   Default to undef
+#
 class keystone::cache (
   $config_prefix                        = $facts['os_service_default'],
   $expiration_time                      = $facts['os_service_default'],
@@ -283,8 +295,8 @@ class keystone::cache (
   $retry_attempts                       = $facts['os_service_default'],
   $retry_delay                          = $facts['os_service_default'],
   $hashclient_retry_attempts            = $facts['os_service_default'],
-  $hashclient_retry_delay               = $facts['os_service_default'],
-  $dead_timeout                         = $facts['os_service_default'],
+  $hashclient_retry_timeout             = $facts['os_service_default'],
+  $hashclient_dead_timeout              = $facts['os_service_default'],
   $token_caching                        = $facts['os_service_default'],
   $token_cache_time                     = $facts['os_service_default'],
   $credential_caching                   = $facts['os_service_default'],
@@ -292,6 +304,9 @@ class keystone::cache (
   $application_credential_caching       = $facts['os_service_default'],
   $application_credential_cache_time    = $facts['os_service_default'],
   Boolean $manage_backend_package       = true,
+  # DEPRECATED PARAMETERS
+  $hashclient_retry_delay               = undef,
+  $dead_timeout                         = undef,
 ) {
   include keystone::deps
 
@@ -346,9 +361,11 @@ class keystone::cache (
     retry_attempts                       => $retry_attempts,
     retry_delay                          => $retry_delay,
     hashclient_retry_attempts            => $hashclient_retry_attempts,
+    hashclient_retry_timeout             => $hashclient_retry_timeout,
+    hashclient_dead_timeout              => $hashclient_dead_timeout,
+    manage_backend_package               => $manage_backend_package,
     hashclient_retry_delay               => $hashclient_retry_delay,
     dead_timeout                         => $dead_timeout,
-    manage_backend_package               => $manage_backend_package,
   }
 
   # all cache settings should be applied and all packages should be installed

releasenotes/notes/cache-rename-haslclient-params-6248ec99c688e19e.yaml

@@ -0,0 +1,9 @@
+---
+deprecations:
+  - |
+    The ``keystone::cache::hashclient_retry_delay`` parameter was deprecated
+    in favor of the new ``hashclient_retry_timeout`` parameter.
+
+  - |
+    The ``keystone::cache::dead_timeout`` parameter was deprecated in favor
+    of the new ``hashclient_dead_timeout`` parameter.

spec/classes/keystone_cache_spec.rb

@@ -55,9 +55,11 @@ describe 'keystone::cache' do
           :retry_attempts                       => '<SERVICE DEFAULT>',
           :retry_delay                          => '<SERVICE DEFAULT>',
           :hashclient_retry_attempts            => '<SERVICE DEFAULT>',
-          :hashclient_retry_delay               => '<SERVICE DEFAULT>',
-          :dead_timeout                         => '<SERVICE DEFAULT>',
+          :hashclient_retry_timeout             => '<SERVICE DEFAULT>',
+          :hashclient_dead_timeout              => '<SERVICE DEFAULT>',
           :manage_backend_package               => true,
+          :hashclient_retry_delay               => nil,
+          :dead_timeout                         => nil,
         )
       end
     end
@@ -97,8 +99,8 @@ describe 'keystone::cache' do
           :retry_attempts                       => 2,
           :retry_delay                          => 0,
           :hashclient_retry_attempts            => 2,
-          :hashclient_retry_delay               => 1,
-          :dead_timeout                         => 60,
+          :hashclient_retry_timeout             => 1,
+          :hashclient_dead_timeout              => 60,
           :manage_backend_package               => false,
           :token_caching                        => true,
           :token_cache_time                     => 3599,
@@ -106,6 +108,8 @@ describe 'keystone::cache' do
           :credential_cache_time                => 3598,
           :application_credential_caching       => true,
           :application_credential_cache_time    => 3597,
+          :hashclient_retry_delay               => 3,
+          :dead_timeout                         => 61,
         }
       end
 
@@ -155,9 +159,11 @@ describe 'keystone::cache' do
           :retry_attempts                       => 2,
           :retry_delay                          => 0,
           :hashclient_retry_attempts            => 2,
-          :hashclient_retry_delay               => 1,
-          :dead_timeout                         => 60,
+          :hashclient_retry_timeout             => 1,
+          :hashclient_dead_timeout              => 60,
           :manage_backend_package               => false,
+          :hashclient_retry_delay               => 3,
+          :dead_timeout                         => 61,
         )
       end
     end