Merge pull request #626 from stackhpc/upstream/2023.1-2024-10-07

Synchronise 2023.1 with upstream

ansible/roles/keystone/defaults/main.yml

@@ -16,7 +16,8 @@ keystone_services:
         tls_backend: "{{ keystone_enable_tls_backend }}"
         port: "{{ keystone_internal_port }}"
         listen_port: "{{ keystone_internal_listen_port }}"
-        backend_http_extra: "{{ ['balance source'] if enable_keystone_federation | bool else [] }}"
+        backend_http_extra:
+          - balance "{{ 'source' if enable_keystone_federation | bool else 'roundrobin' }}"
       keystone_external:
         enabled: "{{ enable_keystone }}"
         mode: "http"
@@ -25,7 +26,8 @@ keystone_services:
         tls_backend: "{{ keystone_enable_tls_backend }}"
         port: "{{ keystone_public_port }}"
         listen_port: "{{ keystone_public_listen_port }}"
-        backend_http_extra: "{{ ['balance source'] if enable_keystone_federation | bool else [] }}"
+        backend_http_extra:
+          - balance "{{ 'source' if enable_keystone_federation | bool else 'roundrobin' }}"
       # NOTE(yoctozepto): Admin port settings are kept only for upgrade compatibility.
       # TODO(yoctozepto): Remove after Zed.
       keystone_admin:
@@ -35,6 +37,8 @@ keystone_services:
         tls_backend: "{{ keystone_enable_tls_backend }}"
         port: "{{ keystone_admin_port }}"
         listen_port: "{{ keystone_admin_listen_port }}"
+        backend_http_extra:
+          - balance "{{ 'source' if enable_keystone_federation | bool else 'roundrobin' }}"
   keystone-ssh:
     container_name: "keystone_ssh"
     group: "keystone"

ansible/roles/mariadb/tasks/recover_cluster.yml

@@ -9,6 +9,7 @@
     path: "{{ item }}"
     state: absent
   delegate_to: localhost
+  connection: local
   changed_when: false
   check_mode: no
   run_once: true
@@ -82,10 +83,12 @@
         dest: "{{ mariadb_recover_tmp_file_path }}"
         mode: 0644
       delegate_to: localhost
+      connection: local
       changed_when: false
       when: seqno_compare.results | map(attribute='stdout') | join('') == ""
 
     - name: Registering mariadb_recover_inventory_name from temp file
+      connection: local
       set_fact:
         mariadb_recover_inventory_name: "{{ lookup('file', mariadb_recover_tmp_file_path) }}"
   when:

releasenotes/notes/bug-2058656-ad68bb260327a267.yaml

@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixes keystone service configuration for haproxy when using federation.
+    `LP#2058656 <https://bugs.launchpad.net/kolla-ansible/+bug/2058656>`__

releasenotes/notes/bug-2073370-268e9a76be9f2ae9.yaml

@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixes the MariaDB recovery issue when kolla-ansible is running from
+    a docker container. `LP#2073370 <https://launchpad.net/bugs/2073370>`__