From a45ef7ccaacb4e68f4e921ec724c16c28329b7e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Tue, 22 Sep 2020 11:58:38 +0200 Subject: [PATCH] Fix default mode in haproxy_single_service_split haproxy_single_service_listen (the default template) was already fine. Closes-Bug: #1896591 TrivialFix Change-Id: Id68fe19ea87565aa36fb74f2a2ca66cb951169f6 --- .../templates/haproxy_single_service_split.cfg.j2 | 2 +- releasenotes/notes/bug-1896591-47c829f8b72d567a.yaml | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/bug-1896591-47c829f8b72d567a.yaml 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 6cb40fa2ec..3712da9c0d 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 @@ -128,7 +128,7 @@ backend {{ service_name }}_back {{ frontend_macro(haproxy_name, haproxy_service.port, mode, external, frontend_http_extra, frontend_tcp_extra) }} {# Redirect (to https) is a special case, as it does not include a backend #} - {% if haproxy_service.mode != 'redirect' %} + {% if mode != 'redirect' %} {{ backend_macro(haproxy_name, listen_port, mode, host_group, custom_member_list, backend_http_extra, backend_tcp_extra, auth_user, auth_pass, tls_backend) }} diff --git a/releasenotes/notes/bug-1896591-47c829f8b72d567a.yaml b/releasenotes/notes/bug-1896591-47c829f8b72d567a.yaml new file mode 100644 index 0000000000..cf7f87a755 --- /dev/null +++ b/releasenotes/notes/bug-1896591-47c829f8b72d567a.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Fixes ``haproxy_single_service_split`` template to work with default for + ``mode`` (``http``). + `LP#1896591 `__