openstack
/
puppet-swift
Code Issues Proposed changes

container-reconciler: Enable cache middleware by default 

The chache middleware is now enabled by default in most of the services
but only container-reconciler disables it by default, though the sample
config container-reconciler config file in the swift repository enables
the middleware.

This updates the default value so that the default pipeline is
consistent among services, and is aligned with the sample files in
swift.

Change-Id: Ifcb4d241de14a9e0b7e3afb79e73b9a57acc9d9e
This commit is contained in:
Takashi Kajinami 2023-12-04 15:40:24 +09:00
parent d0b20eb5d9
commit 5611ed75f5
4 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/containerreconciler.pp
View File

@ -78,7 +78,7 @@ class swift::containerreconciler(
Boolean $manage_service = true,
Boolean $enabled = true,
$package_ensure = 'present',
Swift::Pipeline $pipeline = ['catch_errors', 'proxy-logging', 'proxy-server'],
Swift::Pipeline $pipeline = ['catch_errors', 'proxy-logging', 'cache', 'proxy-server'],
$interval = $facts['os_service_default'],
$reclaim_age = $facts['os_service_default'],
$request_tries = $facts['os_service_default'],

5
releasenotes/notes/container-reconciler-enable-cache-1f05743579752b13.yaml Normal file
View File

@ -0,0 +1,5 @@
---
upgrade:
- |
Default value of ``swift::containererconciler::pipeline`` has been updated
and the default pipeline now contains the cache middleware.

31
spec/classes/swift_containerreconciler_spec.rb
View File

@ -14,7 +14,7 @@ describe 'swift::containerreconciler' do
context 'with defaults' do
it 'configures container-reconciler.conf' do
is_expected.to contain_swift_container_reconciler_config(
'pipeline:main/pipeline').with_value('catch_errors proxy-logging proxy-server')
'pipeline:main/pipeline').with_value('catch_errors proxy-logging cache proxy-server')
is_expected.to contain_swift_container_reconciler_config(
'container-reconciler/interval').with_value('<SERVICE DEFAULT>')
is_expected.to contain_swift_container_reconciler_config(
@ -22,15 +22,15 @@ describe 'swift::containerreconciler' do
is_expected.to contain_swift_container_reconciler_config(
'container-reconciler/request_tries').with_value('<SERVICE DEFAULT>')
is_expected.to contain_swift_container_reconciler_config(
'filter:cache/memcache_servers').with_ensure('absent')
'filter:cache/memcache_servers').with_value('127.0.0.1:11211')
is_expected.to contain_swift_container_reconciler_config(
'filter:cache/tls_enabled').with_ensure('absent')
'filter:cache/tls_enabled').with_value('<SERVICE DEFAULT>')
is_expected.to contain_swift_container_reconciler_config(
'filter:cache/tls_cafile').with_ensure('absent')
'filter:cache/tls_cafile').with_value('<SERVICE DEFAULT>')
is_expected.to contain_swift_container_reconciler_config(
'filter:cache/tls_certfile').with_ensure('absent')
'filter:cache/tls_certfile').with_value('<SERVICE DEFAULT>')
is_expected.to contain_swift_container_reconciler_config(
'filter:cache/tls_keyfile').with_ensure('absent')
'filter:cache/tls_keyfile').with_value('<SERVICE DEFAULT>')
end
it 'configures container-reconciler service' do
@ -62,27 +62,26 @@ describe 'swift::containerreconciler' do
end
end
context 'when including cache in pipeline' do
context 'when chache is not included in pipeline' do
before do
params.merge!(
:pipeline => ['catch_errors', 'proxy-logging', 'cache', 'proxy-server'],
:memcache_servers => ['127.0.0.1:11211'],
:pipeline => ['catch_errors', 'proxy-logging', 'proxy-server'],
)
end
it 'configures memcache servers' do
it 'should not configure memcache servers' do
is_expected.to contain_swift_container_reconciler_config(
'pipeline:main/pipeline').with_value('catch_errors proxy-logging cache proxy-server')
'pipeline:main/pipeline').with_value('catch_errors proxy-logging proxy-server')
is_expected.to contain_swift_container_reconciler_config(
'filter:cache/memcache_servers').with_value('127.0.0.1:11211')
'filter:cache/memcache_servers').with_ensure('absent')
is_expected.to contain_swift_container_reconciler_config(
'filter:cache/tls_enabled').with_value('<SERVICE DEFAULT>')
'filter:cache/tls_enabled').with_ensure('absent')
is_expected.to contain_swift_container_reconciler_config(
'filter:cache/tls_cafile').with_value('<SERVICE DEFAULT>')
'filter:cache/tls_cafile').with_ensure('absent')
is_expected.to contain_swift_container_reconciler_config(
'filter:cache/tls_certfile').with_value('<SERVICE DEFAULT>')
'filter:cache/tls_certfile').with_ensure('absent')
is_expected.to contain_swift_container_reconciler_config(
'filter:cache/tls_keyfile').with_value('<SERVICE DEFAULT>')
'filter:cache/tls_keyfile').with_ensure('absent')
end
end
end

2
spec/classes/swift_objectexpirer_spec.rb
View File

@ -83,6 +83,8 @@ describe 'swift::objectexpirer' do
end
it 'should not configure memcache servers' do
is_expected.to contain_swift_object_expirer_config(
'pipeline:main/pipeline').with_value('catch_errors proxy-logging proxy-server')
is_expected.to contain_swift_object_expirer_config(
'filter:cache/memcache_servers').with_ensure('absent')
is_expected.to contain_swift_object_expirer_config(