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:
@@ -50,6 +50,10 @@
|
|||||||
# Optional but requires write_affinity to be set.
|
# Optional but requires write_affinity to be set.
|
||||||
# Defaults to undef.
|
# Defaults to undef.
|
||||||
#
|
#
|
||||||
|
# [*node_timeout*]
|
||||||
|
# (optional) Configures node_timeout for swift proxy-server
|
||||||
|
# Defaults to undef.
|
||||||
|
#
|
||||||
# [*enabled*]
|
# [*enabled*]
|
||||||
# (optional) Should the service be enabled.
|
# (optional) Should the service be enabled.
|
||||||
# Defaults to true
|
# Defaults to true
|
||||||
@@ -94,6 +98,7 @@ class swift::proxy(
|
|||||||
$read_affinity = undef,
|
$read_affinity = undef,
|
||||||
$write_affinity = undef,
|
$write_affinity = undef,
|
||||||
$write_affinity_node_count = undef,
|
$write_affinity_node_count = undef,
|
||||||
|
$node_timeout = undef,
|
||||||
$manage_service = true,
|
$manage_service = true,
|
||||||
$enabled = true,
|
$enabled = true,
|
||||||
$package_ensure = 'present'
|
$package_ensure = 'present'
|
||||||
|
@@ -102,6 +102,7 @@ describe 'swift::proxy' do
|
|||||||
:read_affinity => 'r1z1=100, r1=200',
|
:read_affinity => 'r1z1=100, r1=200',
|
||||||
:write_affinity => 'r1',
|
:write_affinity => 'r1',
|
||||||
:write_affinity_node_count => '2 * replicas',
|
:write_affinity_node_count => '2 * replicas',
|
||||||
|
:node_timeout => '20',
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
it 'should build the header file with provided values' do
|
it 'should build the header file with provided values' do
|
||||||
@@ -121,7 +122,8 @@ describe 'swift::proxy' do
|
|||||||
'account_autocreate = false',
|
'account_autocreate = false',
|
||||||
'read_affinity = r1z1=100, r1=200',
|
'read_affinity = r1z1=100, r1=200',
|
||||||
'write_affinity = r1',
|
'write_affinity = r1',
|
||||||
'write_affinity_node_count = 2 * replicas'
|
'write_affinity_node_count = 2 * replicas',
|
||||||
|
'node_timeout = 20'
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
@@ -41,3 +41,6 @@ write_affinity = <%= @write_affinity -%>
|
|||||||
<% if @write_affinity_node_count -%>
|
<% if @write_affinity_node_count -%>
|
||||||
write_affinity_node_count = <%= @write_affinity_node_count -%>
|
write_affinity_node_count = <%= @write_affinity_node_count -%>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
<% if @node_timeout -%>
|
||||||
|
node_timeout = <%= @node_timeout -%>
|
||||||
|
<% end %>
|
||||||
|
Reference in New Issue
Block a user