From 023493194a4dad5c822340d073a891ab1e3ba94f Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 25 Aug 2021 11:06:02 +0900 Subject: [PATCH] Remove unused [memcache] options These options has had no effect since Pike, and will be deprecated soon. Related-Bug: #1941020 Change-Id: I6b4cbde624ef2e27db13ff6f7a91c5b55432a2d9 --- manifests/cache.pp | 5 +---- spec/classes/keystone_cache_spec.rb | 6 ------ 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/manifests/cache.pp b/manifests/cache.pp index 0ce1dd639..b34ca273b 100644 --- a/manifests/cache.pp +++ b/manifests/cache.pp @@ -152,10 +152,7 @@ class keystone::cache( } keystone_config { - 'memcache/dead_retry': value => $memcache_dead_retry; - 'memcache/pool_maxsize': value => $memcache_pool_maxsize; - 'memcache/pool_unused_timeout': value => $memcache_pool_unused_timeout; - 'token/caching': value => $token_caching; + 'token/caching': value => $token_caching; } oslo::cache { 'keystone_config': diff --git a/spec/classes/keystone_cache_spec.rb b/spec/classes/keystone_cache_spec.rb index 33f890e03..c28abf7bd 100644 --- a/spec/classes/keystone_cache_spec.rb +++ b/spec/classes/keystone_cache_spec.rb @@ -10,9 +10,6 @@ describe 'keystone::cache' do context 'with default parameters' do it 'configures cache' do - is_expected.to contain_keystone_config('memcache/dead_retry').with_value('') - is_expected.to contain_keystone_config('memcache/pool_maxsize').with_value('') - is_expected.to contain_keystone_config('memcache/pool_unused_timeout').with_value('') is_expected.to contain_keystone_config('token/caching').with_value('') is_expected.to contain_oslo__cache('keystone_config').with( @@ -61,9 +58,6 @@ describe 'keystone::cache' do end it 'configures cache' do - is_expected.to contain_keystone_config('memcache/dead_retry').with_value('60') - is_expected.to contain_keystone_config('memcache/pool_maxsize').with_value('10') - is_expected.to contain_keystone_config('memcache/pool_unused_timeout').with_value('120') is_expected.to contain_keystone_config('token/caching').with_value(true) is_expected.to contain_oslo__cache('keystone_config').with(