openstack
/
puppet-swift
Code Issues Proposed changes

proxy: Support keepalive_timeout 

... which was added in 2.32.0.

Depends-on: https://review.opendev.org/873744
Change-Id: I32711cc8c3d354c395439cb8d83daa9b4393dd39
This commit is contained in:
Takashi Kajinami 2024-04-19 10:26:56 +09:00
parent 3af1a20fe0
commit d9f986eb0a
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/proxy.pp
View File

@ -95,6 +95,10 @@
# (optional) Configures client_timeout for swift proxy-server.
# Defaults to $facts['os_service_default'].
#
# [*keepalive_timeout*]
# (optional) Configures keep_timeout for swift proxy-server.
# Defaults to $facts['os_service_default'].
#
# [*node_timeout*]
# (optional) Configures node_timeout for swift proxy-server
# Defaults to $facts['os_service_default'].
@ -177,6 +181,7 @@ class swift::proxy(
$write_affinity = undef,
$write_affinity_node_count = $facts['os_service_default'],
$client_timeout = $facts['os_service_default'],
$keepalive_timeout = $facts['os_service_default'],
$node_timeout = $facts['os_service_default'],
$recoverable_node_timeout = $facts['os_service_default'],
Boolean $manage_service = true,
@ -233,6 +238,7 @@ class swift::proxy(
'DEFAULT/log_udp_host': value => $log_udp_host;
'DEFAULT/log_udp_port': value => $log_udp_port;
'DEFAULT/client_timeout': value => $client_timeout;
'DEFAULT/keepalive_timeout': value => $keepalive_timeout;
'pipeline:main/pipeline': value => join($pipeline, ' ');
'app:proxy-server/use': value => 'egg:swift#proxy';
'app:proxy-server/set log_name': value => $log_name;

4
releasenotes/notes/proxy-keepalive_timeout-e2e0ded00a36bf61.yaml Normal file
View File

@ -0,0 +1,4 @@
---
features:
- |
The ``swift::proxy::keepalive_timeout`` parameter has been added.

3
spec/classes/swift_proxy_spec.rb
View File

@ -60,6 +60,7 @@ describe 'swift::proxy' do
it { should contain_swift_proxy_config('DEFAULT/log_udp_host').with_value('<SERVICE DEFAULT>') }
it { should contain_swift_proxy_config('DEFAULT/log_udp_port').with_value('<SERVICE DEFAULT>') }
it { should contain_swift_proxy_config('DEFAULT/client_timeout').with_value('<SERVICE DEFAULT>') }
it { should contain_swift_proxy_config('DEFAULT/keepalive_timeout').with_value('<SERVICE DEFAULT>') }
it { should contain_swift_proxy_config('pipeline:main/pipeline').with_value(
['catch_errors', 'gatekeeper', 'healthcheck', 'proxy-logging', 'cache',
'listing_formats', 'tempauth', 'copy', 'proxy-logging', 'proxy-server'].join(' ')) }
@ -138,6 +139,7 @@ describe 'swift::proxy' do
:write_affinity => 'r1',
:write_affinity_node_count => '2 * replicas',
:client_timeout => '120',
:keepalive_timeout => '121',
:node_timeout => '20',
:recoverable_node_timeout => '15',
:cors_allow_origin => ['http://foo.bar:1234', 'https://foo.bar'],
@ -155,6 +157,7 @@ describe 'swift::proxy' do
it { should contain_swift_proxy_config('DEFAULT/log_headers').with_value(false) }
it { should contain_swift_proxy_config('DEFAULT/log_address').with_value('/dev/log') }
it { should contain_swift_proxy_config('DEFAULT/client_timeout').with_value('120') }
it { should contain_swift_proxy_config('DEFAULT/keepalive_timeout').with_value('121') }
it { should contain_swift_proxy_config('pipeline:main/pipeline').with_value('swauth proxy-server') }
it { should contain_swift_proxy_config('app:proxy-server/use').with_value('egg:swift#proxy') }
it { should contain_swift_proxy_config('app:proxy-server/set log_name').with_value('swift-proxy-server') }