openstack/puppet-swift
Code Issues Proposed changes

Merge "Ensure cache parameters are cleared"

Browse Source
This commit is contained in:
Zuul
2022-04-11 20:44:14 +00:00
committed by Gerrit Code Review
parent 2b26763888 afc84ae1ed
commit 17a720091a
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/containerreconciler.pp
View File

@@ -109,6 +109,14 @@ class swift::containerreconciler(
if !empty(grep(any2array($memcache_servers), '127.0.0.1')) { if !empty(grep(any2array($memcache_servers), '127.0.0.1')) {
Class['memcached'] -> Class['swift::containerreconciler'] 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 { swift_container_reconciler_config {

8
manifests/objectexpirer.pp
View File

@@ -158,6 +158,14 @@ class swift::objectexpirer(
if !empty(grep(any2array($memcache_servers), '127.0.0.1')) { if !empty(grep(any2array($memcache_servers), '127.0.0.1')) {
Class['memcached'] -> Class['swift::objectexpirer'] 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 { swift_object_expirer_config {

4
spec/classes/swift_objectexpirer_spec.rb
View File

@@ -92,8 +92,8 @@ describe 'swift::objectexpirer' do
end end
it 'should not configure memcache servers' do it 'should not configure memcache servers' do
is_expected.to_not contain_swift_object_expirer_config( is_expected.to contain_swift_object_expirer_config(
'filter:cache/memcache_servers') 'filter:cache/memcache_servers').with_ensure('absent')
end end
end end