Merge "Fix for external-frontend-map file not being copied"

ansible/roles/loadbalancer/templates/haproxy/haproxy.json.j2

@@ -18,14 +18,14 @@
             "dest": "/etc/haproxy/services.d",
             "owner": "root",
             "perm": "0700"
-        }{% if kolla_enable_tls_external | bool %},
+        },
         {
             "source": "{{ container_config_directory }}/external-frontend-map",
             "dest": "/etc/haproxy/external-frontend-map",
             "owner": "root",
             "perm": "0600",
             "optional": {{ (not haproxy_single_external_frontend | bool) | string | lower }}
-        }{% endif %}{% if kolla_enable_tls_external and letsencrypt_managed_certs == 'internal' or letsencrypt_managed_certs == '' %},
+        }{% if kolla_enable_tls_external and letsencrypt_managed_certs == 'internal' or letsencrypt_managed_certs == '' %},
         {
             "source": "{{ container_config_directory }}/haproxy.pem",
             "dest": "/etc/haproxy/certificates/haproxy.pem",

releasenotes/notes/haproxy_template_fix-ea89b4cf1110602f.yaml

@@ -0,0 +1,9 @@
+---
+fixes:
+  - |
+    Fixes haproxy does not copy external-frontend-map file unless
+    kolla_enable_tls_external is set to true.
+    Removed <if> condition preventing external-frontend-map file
+    from being copied into haproxy container when external TLS is
+    not enabled.
+    `LP#2098765 <https://launchpad.net/bugs/2098765>`__

zuul.d/base.yaml

@@ -270,6 +270,7 @@
     voting: false
     files: !inherit
       - ^ansible/roles/haproxy/
+      - ^ansible/roles/loadbalancer/
       - ^kolla_ansible/kolla_url.py
     vars:
       external_api_interface_name: vxlan2