diff --git a/manifests/containerreconciler.pp b/manifests/containerreconciler.pp index b756b48f..90802db0 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