openstack/charm-swift-proxy
Code Issues Proposed changes

Add haproxy context for new timeout values. Fix template whitespace

Browse Source
This commit is contained in:
David Ames
2015-12-07 15:19:28 -08:00
parent 1828de88f6
commit f0970087af
2 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
charmhelpers/contrib/openstack/context.py
View File

@@ -626,6 +626,12 @@ class HAProxyContext(OSContextGenerator):
if config('haproxy-client-timeout'): if config('haproxy-client-timeout'):
ctxt['haproxy_client_timeout'] = config('haproxy-client-timeout') ctxt['haproxy_client_timeout'] = config('haproxy-client-timeout')
if config('haproxy-queue-timeout'):
ctxt['haproxy_queue_timeout'] = config('haproxy-queue-timeout')
if config('haproxy-connect-timeout'):
ctxt['haproxy_connect_timeout'] = config('haproxy-connect-timeout')
if config('prefer-ipv6'): if config('prefer-ipv6'):
ctxt['ipv6'] = True ctxt['ipv6'] = True
ctxt['local_host'] = 'ip6-localhost' ctxt['local_host'] = 'ip6-localhost'

25
charmhelpers/contrib/openstack/templates/haproxy.cfg
View File

@@ -12,27 +12,26 @@ defaults
option tcplog option tcplog
option dontlognull option dontlognull
retries 3 retries 3
{% if haproxy_queue_timeout -%} {%- if haproxy_queue_timeout %}
timeout queue {{ haproxy_queue_timeout }} timeout queue {{ haproxy_queue_timeout }}
{% else -%} {%- else %}
timeout queue 5000 timeout queue 5000
{% endif -%} {%- endif %}
{% if haproxy_connect_timeout -%} {%- if haproxy_connect_timeout %}
timeout connect {{ haproxy_connect_timeout }} timeout connect {{ haproxy_connect_timeout }}
{% else -%} {%- else %}
timeout connect 5000 timeout connect 5000
{% endif -%} {%- endif %}
{% if haproxy_client_timeout -%} {%- if haproxy_client_timeout %}
timeout client {{ haproxy_client_timeout }} timeout client {{ haproxy_client_timeout }}
{% else -%} {%- else %}
timeout client 30000 timeout client 30000
{% endif -%} {%- endif %}
{%- if haproxy_server_timeout %}
{% if haproxy_server_timeout -%}
timeout server {{ haproxy_server_timeout }} timeout server {{ haproxy_server_timeout }}
{% else -%} {%- else %}
timeout server 30000 timeout server 30000
{% endif -%} {%- endif %}
listen stats {{ stat_port }} listen stats {{ stat_port }}
mode http mode http