~thedac/charms/trusty/openstack-dashboard/lp1522130

« back to all changes in this revision

Viewing changes to hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg

  • Committer: David Ames
  • Date: 2015-12-03 22:54:20 UTC
  • Revision ID: david.ames@canonical.com-20151203225420-e13c6ezb4v174qpk
Fix lp:1522130 Add sane haproxy timeout defaults and make them configurable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
12
12
    option tcplog
13
13
    option dontlognull
14
14
    retries 3
15
 
    timeout queue 1000
16
 
    timeout connect 1000
 
15
{% if haproxy_queue_timeout -%}
 
16
    timeout queue {{ haproxy_queue_timeout }}
 
17
{% else -%}
 
18
    timeout queue 5000
 
19
{% endif -%}
 
20
{% if haproxy_connect_timeout -%}
 
21
    timeout connect {{ haproxy_connect_timeout }}
 
22
{% else -%}
 
23
    timeout connect 5000
 
24
{% endif -%}
17
25
{% if haproxy_client_timeout -%}
18
26
    timeout client {{ haproxy_client_timeout }}
19
27
{% else -%}