Keystone v3 updates

Match g-ss-s ksv3 with simplestreams ksv3 implementation.

charm-helpers sync
This commit is contained in:
David Ames
2017-09-12 22:16:54 +00:00
parent 467233b088
commit a47ceff0b4
23 changed files with 1095 additions and 353 deletions

View File

@@ -1,6 +1,6 @@
global
log {{ local_host }} local0
log {{ local_host }} local1 notice
log /var/lib/haproxy/dev/log local0
log /var/lib/haproxy/dev/log local1 notice
maxconn 20000
user haproxy
group haproxy
@@ -48,9 +48,7 @@ listen stats
{% 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 }}