From afc84ae1ed79fb2749572ed2faaa8b4cf73ad26d Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 6 Apr 2022 10:37:58 +0900 Subject: [PATCH] Ensure cache parameters are cleared This change ensures cache parameters of container-reconciler and object-expirer are cleared when the cache middleware is not enabled in these two services. Change-Id: I062c878a674c9550ea60dce6a4f4123ceb885ac7 --- manifests/containerreconciler.pp | 8 ++++++++ manifests/objectexpirer.pp | 8 ++++++++ spec/classes/swift_objectexpirer_spec.rb | 4 ++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/manifests/containerreconciler.pp b/manifests/containerreconciler.pp index 3bb227a7..e41ec4ad 100644 --- a/manifests/containerreconciler.pp +++ b/manifests/containerreconciler.pp @@ -109,6 +109,14 @@ class swift::containerreconciler( if !empty(grep(any2array($memcache_servers), '127.0.0.1')) { Class['memcached'] -> Class['swift::containerreconciler'] } + } else { + swift_container_reconciler_config { + 'filter:cache/memcache_servers': ensure => absent; + 'filter:cache/tls_enabled': ensure => absent; + 'filter:cache/tls_cafile': ensure => absent; + 'filter:cache/tls_certfile': ensure => absent; + 'filter:cache/tls_keyfile': ensure => absent; + } } swift_container_reconciler_config { diff --git a/manifests/objectexpirer.pp b/manifests/objectexpirer.pp index 409ec44b..53b368be 100644 --- a/manifests/objectexpirer.pp +++ b/manifests/objectexpirer.pp @@ -158,6 +158,14 @@ class swift::objectexpirer( if !empty(grep(any2array($memcache_servers), '127.0.0.1')) { Class['memcached'] -> Class['swift::objectexpirer'] } + } else { + swift_object_expirer_config { + 'filter:cache/memcache_servers': ensure => absent; + 'filter:cache/tls_enabled': ensure => absent; + 'filter:cache/tls_cafile': ensure => absent; + 'filter:cache/tls_certfile': ensure => absent; + 'filter:cache/tls_keyfile': ensure => absent; + } } swift_object_expirer_config { diff --git a/spec/classes/swift_objectexpirer_spec.rb b/spec/classes/swift_objectexpirer_spec.rb index 6b46c623..08cb0a8c 100644 --- a/spec/classes/swift_objectexpirer_spec.rb +++ b/spec/classes/swift_objectexpirer_spec.rb @@ -92,8 +92,8 @@ describe 'swift::objectexpirer' do end it 'should not configure memcache servers' do - is_expected.to_not contain_swift_object_expirer_config( - 'filter:cache/memcache_servers') + is_expected.to contain_swift_object_expirer_config( + 'filter:cache/memcache_servers').with_ensure('absent') end end