openstack/charm-keystone
Code Issues Proposed changes

charmhelper sync

Browse Source
This commit is contained in:
Liam Young 2015-01-05 09:30:05 +00:00
parent 6733d61caf
commit 6f5c9e0f44
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -491,6 +491,7 @@ class HAProxyContext(OSContextGenerator):
ctxt['haproxy_client_timeout'] = config('haproxy-client-timeout')
if config('prefer-ipv6'):
ctxt['ipv6'] = True
ctxt['local_host'] = 'ip6-localhost'
ctxt['haproxy_host'] = '::'
ctxt['stat_port'] = ':::8888'

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

@ -38,7 +38,9 @@ listen stats {{ stat_port }}
{% for service, ports in service_ports.items() -%}
frontend tcp-in_{{ service }}
bind *:{{ ports[0] }}
{% if ipv6 -%}
bind :::{{ ports[0] }}
{% endif -%}
{% for frontend in frontends -%}
acl net_{{ frontend }} dst {{ frontends[frontend]['network'] }}
use_backend {{ service }}_{{ frontend }} if net_{{ frontend }}