From 30e759b35e2386c83378cb56f12eba6c7a49c4df Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Thu, 14 Dec 2023 17:51:27 +0900
Subject: [PATCH] Support [cache] memcache_pool_flush_on_reconnect

Depends-on: https://review.opendev.org/902861
Change-Id: Ib488afff91a994791b911d7c2cf79cad9aa99d85
---
 manifests/cache.pp                                         | 7 +++++++
 .../memcache_pool_flush_on_reconnect-abb762986f6bbf3f.yaml | 5 +++++
 spec/classes/keystone_cache_spec.rb                        | 3 +++
 3 files changed, 15 insertions(+)
 create mode 100644 releasenotes/notes/memcache_pool_flush_on_reconnect-abb762986f6bbf3f.yaml

diff --git a/manifests/cache.pp b/manifests/cache.pp
index 940305a11..d28b170bc 100644
--- a/manifests/cache.pp
+++ b/manifests/cache.pp
@@ -102,6 +102,11 @@
 #   client connection. (integer value)
 #   Defaults to $facts['os_service_default']
 #
+# [*memcache_pool_flush_on_reconnect*]
+#   (Optional) Global toggle if memcache will be flushed on reconnect.
+#   (oslo_cache.memcache_pool backend only)
+#   Defaults to $facts['os_service_default']
+#
 # [*manage_backend_package*]
 #   (Optional) Whether to install the backend package for the cache.
 #   Defaults to true
@@ -193,6 +198,7 @@ class keystone::cache(
   $memcache_pool_maxsize                = $facts['os_service_default'],
   $memcache_pool_unused_timeout         = $facts['os_service_default'],
   $memcache_pool_connection_get_timeout = $facts['os_service_default'],
+  $memcache_pool_flush_on_reconnect     = $facts['os_service_default'],
   $manage_backend_package               = true,
   $token_caching                        = $facts['os_service_default'],
   $tls_enabled                          = $facts['os_service_default'],
@@ -236,6 +242,7 @@ class keystone::cache(
     memcache_pool_maxsize                => $memcache_pool_maxsize,
     memcache_pool_unused_timeout         => $memcache_pool_unused_timeout,
     memcache_pool_connection_get_timeout => $memcache_pool_connection_get_timeout,
+    memcache_pool_flush_on_reconnect     => $memcache_pool_flush_on_reconnect,
     manage_backend_package               => $manage_backend_package,
     tls_enabled                          => $tls_enabled,
     tls_cafile                           => $tls_cafile,
diff --git a/releasenotes/notes/memcache_pool_flush_on_reconnect-abb762986f6bbf3f.yaml b/releasenotes/notes/memcache_pool_flush_on_reconnect-abb762986f6bbf3f.yaml
new file mode 100644
index 000000000..59fb648ef
--- /dev/null
+++ b/releasenotes/notes/memcache_pool_flush_on_reconnect-abb762986f6bbf3f.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    The new ``keystone::cache::memcache_pool_flush_on_reconnect`` parameter has
+    been added.
diff --git a/spec/classes/keystone_cache_spec.rb b/spec/classes/keystone_cache_spec.rb
index 4e919b129..cb85a4aab 100644
--- a/spec/classes/keystone_cache_spec.rb
+++ b/spec/classes/keystone_cache_spec.rb
@@ -30,6 +30,7 @@ describe 'keystone::cache' do
           :memcache_pool_maxsize                => '<SERVICE DEFAULT>',
           :memcache_pool_unused_timeout         => '<SERVICE DEFAULT>',
           :memcache_pool_connection_get_timeout => '<SERVICE DEFAULT>',
+          :memcache_pool_flush_on_reconnect     => '<SERVICE DEFAULT>',
           :tls_enabled                          => '<SERVICE DEFAULT>',
           :tls_cafile                           => '<SERVICE DEFAULT>',
           :tls_certfile                         => '<SERVICE DEFAULT>',
@@ -65,6 +66,7 @@ describe 'keystone::cache' do
           :memcache_pool_maxsize                => '10',
           :memcache_pool_unused_timeout         => '120',
           :memcache_pool_connection_get_timeout => '360',
+          :memcache_pool_flush_on_reconnect     => false,
           :tls_enabled                          => false,
           :enable_retry_client                  => false,
           :retry_attempts                       => 2,
@@ -98,6 +100,7 @@ describe 'keystone::cache' do
           :memcache_pool_maxsize                => '10',
           :memcache_pool_unused_timeout         => '120',
           :memcache_pool_connection_get_timeout => '360',
+          :memcache_pool_flush_on_reconnect     => false,
           :tls_enabled                          => false,
           :tls_cafile                           => '<SERVICE DEFAULT>',
           :tls_certfile                         => '<SERVICE DEFAULT>',