Synchronise master with upstream

ansible/roles/designate/tasks/config.yml

@@ -92,7 +92,7 @@
     mode: "0660"
   become: true
   when:
-    - designate_backend == 'bind9' and designate_backend_external == 'no'
+    - designate_backend == 'bind9' and not designate_backend_external | bool
     - item.key in [ "designate-backend-bind9", "designate-worker" ]
   with_dict: "{{ designate_services | select_services_enabled_and_mapped_to_host }}"
 
@@ -103,7 +103,7 @@
     mode: "0660"
   become: true
   when:
-    - designate_backend == 'bind9' and designate_backend_external == 'no'
+    - designate_backend == 'bind9' and not designate_backend_external | bool
     - item.key in [ "designate-backend-bind9", "designate-worker" ]
   with_dict: "{{ designate_services | select_services_enabled_and_mapped_to_host }}"
 

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() %}

ansible/roles/loadbalancer/defaults/main.yml

@@ -192,7 +192,7 @@ keepalived_track_script_enabled: true
 # Default backend for single external frontend (for missing mappings)
 haproxy_external_single_frontend_default_backend: "horizon_external_back"
 
-haproxy_external_single_frontend_public_port: "443"
+haproxy_single_external_frontend_public_port: "443"
 
 haproxy_external_single_frontend_options:
   - option httplog

ansible/roles/loadbalancer/templates/haproxy/haproxy_external_frontend.cfg.j2

@@ -7,6 +7,6 @@ frontend external_frontend
     {{ http_option }}
 {% endfor %}
     http-request set-header X-Forwarded-Proto https if { ssl_fc }
-    bind {{ kolla_external_vip_address }}:{{ haproxy_external_single_frontend_public_port }} {{ external_tls_bind_info }}
+    bind {{ kolla_external_vip_address }}:{{ haproxy_single_external_frontend_public_port }} {{ external_tls_bind_info }}
     use_backend %[req.hdr(host),lower,map_dom(/etc/haproxy/external-frontend-map,{{ haproxy_external_single_frontend_default_backend }})]
     http-request deny if { path -i -m beg /server-status }

tests/templates/globals-default.j2

@@ -297,13 +297,5 @@ enable_valkey: "yes"
 enable_keystone_federation: true
 {% endif %}
 
-{% if scenario == "federation" %}
-enable_keystone_federation: true
-{% endif %}
-
-{% if scenario == "federation" %}
-enable_keystone_federation: true
-{% endif %}
-
 mariadb_monitor_read_only_interval: "30000"
 mariadb_monitor_galera_healthcheck_timeout: "30000"