openstack/charm-glance
Code Issues Proposed changes

Resync helpers

Browse Source
This commit is contained in:
James Page 2014-09-26 12:09:13 +01:00
parent 7a09002a7d
commit a5cd0bdf96
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hooks/charmhelpers/contrib/openstack/context.py
View File

@ -428,9 +428,9 @@ class HAProxyContext(OSContextGenerator):
}
if config('haproxy-server-timeout'):
ctxt['haproxy-server-timeout'] = config('haproxy-server-timeout')
ctxt['haproxy_server_timeout'] = config('haproxy-server-timeout')
if config('haproxy-client-timeout'):
ctxt['haproxy-client-timeout'] = config('haproxy-client-timeout')
ctxt['haproxy_client_timeout'] = config('haproxy-client-timeout')
if config('prefer-ipv6'):
ctxt['local_host'] = 'ip6-localhost'

8
hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg
View File

@ -14,14 +14,14 @@ defaults
retries 3
timeout queue 1000
timeout connect 1000
{% if haproxy-client-timeout -%}
timeout client {{ haproxy-client-timeout }}
{% if haproxy_client_timeout -%}
timeout client {{ haproxy_client_timeout }}
{% else -%}
timeout client 30000
{% endif -%}
{% if haproxy-server-timeout -%}
timeout server {{ haproxy-server-timeout }}
{% if haproxy_server_timeout -%}
timeout server {{ haproxy_server_timeout }}
{% else -%}
timeout server 30000
{% endif -%}