openstack/openstack-ansible
Code Issues Proposed changes

Specify units in haproxy configuration

Browse Source 
Previous update omitted the 's' suffix so the value was interpreted as
miliseconds. This patch corrects that.

Change-Id: Ie7fa32a472105b2e7ba1074122b3abd8b4467f4c
Closes-Bug: #1402580
This commit is contained in:
Hugh Saunders 2014-12-16 16:42:18 +00:00
parent 04b9ff0c56
commit 8c2f84bd8a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/rpc_deploy/user_variables.yml
View File

@ -168,5 +168,5 @@ swift_dispersion_password:
# This variables is used to set haproxy's timeout client and timeout server
# values, they are set in the main config file and are only used by services
# that don't set their own values (default: 90)
#haproxy_timeout: 90
# that don't set their own values (default: 90s)
#haproxy_timeout: 90s

4
rpc_deployment/roles/haproxy_common/templates/haproxy.cfg
View File

@ -14,9 +14,9 @@ defaults
option dontlognull
option redispatch
retries 3
timeout client {{ haproxy_timeout|default(90) }}
timeout client {{ haproxy_timeout|default('90s') }}
timeout connect 10s
timeout server {{ haproxy_timeout|default(90) }}
timeout server {{ haproxy_timeout|default('90s') }}
maxconn 4096
errorfile 400 /etc/haproxy/errors/400.http
errorfile 403 /etc/haproxy/errors/403.http