Add node_timeout parameter for proxy-server.conf

This commit allows to configure the node_timeout parameter
of proxy-server.conf proxy-server middleware in the pipeline.

Change-Id: Idbac35336a5b266f6de288a28243f91ee4d67afd
This commit is contained in:
David Moreau Simard
2015-03-25 13:53:50 -04:00
parent 15aa71f001
commit 7a0c615db8
3 changed files with 11 additions and 1 deletions

View File

@@ -50,6 +50,10 @@
# Optional but requires write_affinity to be set.
# Defaults to undef.
#
# [*node_timeout*]
# (optional) Configures node_timeout for swift proxy-server
# Defaults to undef.
#
# [*enabled*]
# (optional) Should the service be enabled.
# Defaults to true
@@ -94,6 +98,7 @@ class swift::proxy(
$read_affinity = undef,
$write_affinity = undef,
$write_affinity_node_count = undef,
$node_timeout = undef,
$manage_service = true,
$enabled = true,
$package_ensure = 'present'

View File

@@ -102,6 +102,7 @@ describe 'swift::proxy' do
:read_affinity => 'r1z1=100, r1=200',
:write_affinity => 'r1',
:write_affinity_node_count => '2 * replicas',
:node_timeout => '20',
}
end
it 'should build the header file with provided values' do
@@ -121,7 +122,8 @@ describe 'swift::proxy' do
'account_autocreate = false',
'read_affinity = r1z1=100, r1=200',
'write_affinity = r1',
'write_affinity_node_count = 2 * replicas'
'write_affinity_node_count = 2 * replicas',
'node_timeout = 20'
]
)
end

View File

@@ -41,3 +41,6 @@ write_affinity = <%= @write_affinity -%>
<% if @write_affinity_node_count -%>
write_affinity_node_count = <%= @write_affinity_node_count -%>
<% end %>
<% if @node_timeout -%>
node_timeout = <%= @node_timeout -%>
<% end %>