openstack/puppet-oslo
Code Issues Proposed changes

Add support for [cache] memcache_pool_flush_on_reconnect

Browse Source 
... so that all memcache pool options are supported.

Change-Id: Idf443c2d8f2f5d5b77e3129ac6affa4d91490222
This commit is contained in:
Takashi Kajinami
2023-12-07 12:47:10 +09:00
parent ef4f35ab29
commit a878ebe071
3 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/cache.pp
View File

@@ -135,6 +135,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']
#
# [*tls_enabled*]
# (Optional) Global toggle for TLS usage when communicating with
# the caching servers.
@@ -225,6 +230,7 @@ define oslo::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'],
$tls_enabled = $facts['os_service_default'],
$tls_cafile = $facts['os_service_default'],
$tls_certfile = $facts['os_service_default'],
@@ -302,6 +308,7 @@ define oslo::cache(
'cache/memcache_pool_maxsize' => { value => $memcache_pool_maxsize },
'cache/memcache_pool_unused_timeout' => { value => $memcache_pool_unused_timeout },
'cache/memcache_pool_connection_get_timeout' => { value => $memcache_pool_connection_get_timeout },
'cache/memcache_pool_flush_on_reconnect' => { value => $memcache_pool_flush_on_reconnect },
'cache/tls_enabled' => { value => $tls_enabled },
'cache/tls_cafile' => { value => $tls_cafile },
'cache/tls_certfile' => { value => $tls_certfile },

5
releasenotes/notes/cache-memcache_pool_flush_on_reconnect-ef097a16a54d9fac.yaml Normal file
View File

@@ -0,0 +1,5 @@
---
features:
- |
The new ``oslo::cache::memcache_pool_flush_on_reconnect`` parameter has
been added.

3
spec/defines/oslo_cache_spec.rb
View File

@@ -25,6 +25,7 @@ describe 'oslo::cache' do
is_expected.to contain_keystone_config('cache/memcache_pool_maxsize').with_value('<SERVICE DEFAULT>')
is_expected.to contain_keystone_config('cache/memcache_pool_unused_timeout').with_value('<SERVICE DEFAULT>')
is_expected.to contain_keystone_config('cache/memcache_pool_connection_get_timeout').with_value('<SERVICE DEFAULT>')
is_expected.to contain_keystone_config('cache/memcache_pool_flush_on_reconnect').with_value('<SERVICE DEFAULT>')
is_expected.to contain_keystone_config('cache/tls_enabled').with_value('<SERVICE DEFAULT>')
is_expected.to contain_keystone_config('cache/tls_cafile').with_value('<SERVICE DEFAULT>')
is_expected.to contain_keystone_config('cache/tls_certfile').with_value('<SERVICE DEFAULT>')
@@ -59,6 +60,7 @@ describe 'oslo::cache' do
:memcache_pool_maxsize => '10',
:memcache_pool_unused_timeout => '60',
:memcache_pool_connection_get_timeout => '10',
:memcache_pool_flush_on_reconnect => false,
:tls_enabled => false,
:tls_cafile => '/path/to/ssl/cafile',
:tls_certfile => '/path/to/ssl/certfile',
@@ -91,6 +93,7 @@ describe 'oslo::cache' do
is_expected.to contain_keystone_config('cache/memcache_pool_maxsize').with_value('10')
is_expected.to contain_keystone_config('cache/memcache_pool_unused_timeout').with_value('60')
is_expected.to contain_keystone_config('cache/memcache_pool_connection_get_timeout').with_value('10')
is_expected.to contain_keystone_config('cache/memcache_pool_flush_on_reconnect').with_value(false)
is_expected.to contain_keystone_config('cache/tls_enabled').with_value('false')
is_expected.to contain_keystone_config('cache/tls_cafile').with_value('/path/to/ssl/cafile')
is_expected.to contain_keystone_config('cache/tls_certfile').with_value('/path/to/ssl/certfile')