aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2023-09-27 19:10:23 +0000
committerGerrit Code Review <review@openstack.org>2023-09-27 19:10:23 +0000
commit28bf63f269087cefae0fe609c42971d306c9d73c (patch)
tree502dbb1bfa9eeb1cdbe82767fb81f96341fc5974
parentfdc3b122c1039d93190e68d925af21d459b4a4bf (diff)
parentf2a63a522cf2a2fa1251054f214d096617ad4f67 (diff)
downloadkolla-ansible-28bf63f269087cefae0fe609c42971d306c9d73c.tar.gz
kolla-ansible-28bf63f269087cefae0fe609c42971d306c9d73c.zip
Merge "Fix http/2 support for internal endpoints"
-rw-r--r--ansible/roles/haproxy-config/templates/haproxy_single_service_split.cfg.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/ansible/roles/haproxy-config/templates/haproxy_single_service_split.cfg.j2 b/ansible/roles/haproxy-config/templates/haproxy_single_service_split.cfg.j2
index 96b18f8e5..127ff911d 100644
--- a/ansible/roles/haproxy-config/templates/haproxy_single_service_split.cfg.j2
+++ b/ansible/roles/haproxy-config/templates/haproxy_single_service_split.cfg.j2
@@ -2,7 +2,7 @@
{%- set external_tls_bind_info = 'ssl crt /etc/haproxy/haproxy.pem' if kolla_enable_tls_external|bool else '' %}
{%- set external_tls_bind_info = "%s %s" % (external_tls_bind_info, haproxy_http2_protocol) if kolla_enable_tls_external|bool and haproxy_enable_http2|bool else external_tls_bind_info %}
{%- set internal_tls_bind_info = 'ssl crt /etc/haproxy/haproxy-internal.pem' if kolla_enable_tls_internal|bool else '' %}
-{%- set internal_tls_bind_info = "%s %s" % (internal_tls_bind_info, haproxy_http2_protocol) if kolla_enable_tls_internal|bool and haproxy_enable_http2|bool else external_tls_bind_info %}
+{%- set internal_tls_bind_info = "%s %s" % (internal_tls_bind_info, haproxy_http2_protocol) if kolla_enable_tls_internal|bool and haproxy_enable_http2|bool else internal_tls_bind_info %}
{%- macro userlist_macro(service_name, auth_user, auth_pass) %}
userlist {{ service_name }}-user