aboutsummaryrefslogtreecommitdiff
path: root/ansible/roles/haproxy-config
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2025-12-01 08:47:16 +0000
committerGerrit Code Review <review@openstack.org>2025-12-01 08:47:16 +0000
commit40ff63f8d5e3ba5b9db68df3fb3ea68eaef403ca (patch)
tree533dc2c9dd7a0651fbc9ec304c382c6286a6e1ea /ansible/roles/haproxy-config
parentbb4feef1b905bb5a65feec5d6c2e2217504a69a5 (diff)
parent1902193390867bed09ec2daa24e8d38ebcb0d15b (diff)
downloadkolla-ansible-40ff63f8d5e3ba5b9db68df3fb3ea68eaef403ca.tar.gz
kolla-ansible-40ff63f8d5e3ba5b9db68df3fb3ea68eaef403ca.zip
Merge "Add two unused variables to haproxy-config template file"
Diffstat (limited to 'ansible/roles/haproxy-config')
-rw-r--r--ansible/roles/haproxy-config/templates/haproxy_single_service_split.cfg.j24
1 files changed, 2 insertions, 2 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 7c3ad3fd5..76a92e9b0 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
@@ -138,10 +138,10 @@ backend {{ service_name }}_back
{% set host_group = haproxy_service.host_group|default(service.group) %}
{# Additional options can be defined in config, and are additive to the global extras #}
{% set frontend_tcp_extra = haproxy_service.frontend_tcp_extra|default([]) + haproxy_frontend_tcp_extra %}
- {% set backend_tcp_extra = haproxy_service.backend_tcp_extra|default([]) %}
+ {% set backend_tcp_extra = haproxy_service.backend_tcp_extra|default([]) + haproxy_backend_tcp_extra %}
{% set frontend_http_extra = haproxy_service.frontend_http_extra|default([]) + haproxy_frontend_http_extra %}
{% set frontend_redirect_extra = haproxy_service.frontend_redirect_extra|default([]) + haproxy_frontend_redirect_extra %}
- {% set backend_http_extra = haproxy_service.backend_http_extra|default([]) %}
+ {% set backend_http_extra = haproxy_service.backend_http_extra|default([]) + haproxy_backend_http_extra %}
{% set tls_backend = haproxy_service.tls_backend|default(false) %}
{# Allow for basic auth #}
{% set auth_user = haproxy_service.auth_user|default() %}