commit 4db2e7d0d9f39a06664d9a13b148212ae934f53a
author Ales Komarek <akomarek@mirantis.com> Thu Jun 22 12:21:58 2017 +0000
committer Gerrit Code Review <gerrit2@32a4cf582fa9> Thu Jun 22 12:21:58 2017 +0000
tree dc1b23f66f387eb542ea8947771e6caf88a01d42
parent 187c1ee38d97c81712ce6d2cac0673c833bca8a4
parent 8f1afa2d42d3a5b100466b2b110f3a13f89b3aee

Merge "Fix SSL bind condtions"

haproxy/files/haproxy.cfg

diff --git a/haproxy/files/haproxy.cfg b/haproxy/files/haproxy.cfg
index 0cdfcbd..3a2283b 100644
--- a/haproxy/files/haproxy.cfg
+++ b/haproxy/files/haproxy.cfg
@@ -63,7 +63,7 @@
 
 listen {{ listen_name }}
   {%- for bind in listen.binds %}
-  bind {{ bind.address }}:{{ bind.port }} {% if bind.get('ssl', {}).enabled|default(False) %}{% if bind.ssl.pem_file is defined %}ssl crt {{ bind.ssl.pem_file }}{% else %}crt /etc/haproxy/ssl/{{ listen_name }}{% endif %}{% endif %}
+  bind {{ bind.address }}:{{ bind.port }} {% if bind.get('ssl', {}).enabled|default(False) %}{% if bind.ssl.pem_file is defined %}ssl crt {{ bind.ssl.pem_file }}{% else %}ssl crt /etc/haproxy/ssl/{{ listen_name }}{% endif %}{% endif %}
   {%- endfor %}
   {%- if listen.get('type', None) == 'http' %}
   mode http