openstack/kolla-ansible
Code Issues Proposed changes

Fix indentation in haproxy config

Browse Source 
Commit [1] introduced a bug into kolla-ansible
where there is incorrect indentation in the haproxy
configuration file. This patch fixes it.

[1] b13fa5a92c

Closes-Bug: #2080034
Change-Id: I3375e303bc358fc79d1fa2e219e6ec1dba7a38ba
This commit is contained in:
Michal Arbet 2024-09-09 20:08:44 +02:00
parent d62523f778
commit 757319f0c6
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/roles/glance/templates/glance-tls-proxy.cfg.j2
View File

@ -11,7 +11,9 @@ global
cpu-map auto:1/all 0-63 cpu-map auto:1/all 0-63
{% endif %} {% endif %}
{% if kolla_enable_tls_external | bool or kolla_enable_tls_internal | bool %} {% if kolla_enable_tls_external | bool or kolla_enable_tls_internal | bool %}
{{ haproxy_ssl_settings }} {% for line in haproxy_ssl_settings.split('\n') %}
{{ line }}
{% endfor %}
tune.ssl.default-dh-param 4096 tune.ssl.default-dh-param 4096
ca-base {{ haproxy_backend_cacert_dir }} ca-base {{ haproxy_backend_cacert_dir }}
{% endif %} {% endif %}

4
ansible/roles/loadbalancer/templates/haproxy/haproxy_main.cfg.j2
View File

@ -13,7 +13,9 @@ global
stats socket /var/lib/kolla/haproxy/haproxy.sock group kolla mode 660{% if haproxy_socket_level_admin | bool %} level admin{% endif %} stats socket /var/lib/kolla/haproxy/haproxy.sock group kolla mode 660{% if haproxy_socket_level_admin | bool %} level admin{% endif %}
{% if kolla_enable_tls_external | bool or kolla_enable_tls_internal | bool %} {% if kolla_enable_tls_external | bool or kolla_enable_tls_internal | bool %}
{{ haproxy_ssl_settings }} {% for line in haproxy_ssl_settings.split('\n') %}
{{ line }}
{% endfor %}
tune.ssl.default-dh-param 4096 tune.ssl.default-dh-param 4096
ca-base {{ haproxy_backend_cacert_dir }} ca-base {{ haproxy_backend_cacert_dir }}
{% endif %} {% endif %}

4
ansible/roles/neutron/templates/neutron-tls-proxy.cfg.j2
View File

@ -11,7 +11,9 @@ global
cpu-map auto:1/all 0-63 cpu-map auto:1/all 0-63
{% endif %} {% endif %}
{% if kolla_enable_tls_external | bool or kolla_enable_tls_internal | bool %} {% if kolla_enable_tls_external | bool or kolla_enable_tls_internal | bool %}
{{ haproxy_ssl_settings }} {% for line in haproxy_ssl_settings.split('\n') %}
{{ line }}
{% endfor %}
tune.ssl.default-dh-param 4096 tune.ssl.default-dh-param 4096
ca-base {{ haproxy_backend_cacert_dir }} ca-base {{ haproxy_backend_cacert_dir }}
{% endif %} {% endif %}

5
releasenotes/notes/bug-2080034-b217a4200a6c6eda.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- |
Fixes indentation in haproxy configuration.
`LP#2080034 <https://launchpad.net/bugs/2080034>`__