Merge pull request #618 from stackhpc/upstream/zed-2024-09-16

Synchronise zed with upstream
stackhpc · Sep 16, 2024 · 6f21457 · 6f21457
2 parents fe463cf + 76cc9bf
commit 6f21457
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 2 deletions.
diff --git a/ansible/library/kolla_toolbox.py b/ansible/library/kolla_toolbox.py
@@ -181,7 +181,9 @@ def main():
                        "ANSIBLE_LOAD_CALLBACK_PLUGINS": "True"}
         job = client.exec_create(kolla_toolbox, command_line,
                                  environment=environment, **kwargs)
-        json_output = client.exec_start(job)
+        json_output, error = client.exec_start(job, demux=True)
+        if error:
+            module.log(msg='Inner module stderr: %s' % error)
 
         try:
             output = json.loads(json_output)

diff --git a/ansible/roles/common/defaults/main.yml b/ansible/roles/common/defaults/main.yml
@@ -17,6 +17,7 @@ common_services:
     environment:
       ANSIBLE_NOCOLOR: "1"
       ANSIBLE_LIBRARY: "/usr/share/ansible"
+      REQUESTS_CA_BUNDLE: "{{ openstack_cacert }}"
     privileged: True
     volumes: "{{ kolla_toolbox_default_volumes + kolla_toolbox_extra_volumes }}"
     dimensions: "{{ kolla_toolbox_dimensions }}"

diff --git a/ansible/roles/horizon/templates/local_settings.j2 b/ansible/roles/horizon/templates/local_settings.j2
@@ -206,7 +206,8 @@ AVAILABLE_REGIONS = [
 
 OPENSTACK_HOST = "{{ kolla_internal_fqdn }}"
 
-OPENSTACK_KEYSTONE_URL = "{{ horizon_keystone_url }}"
+# TODO(fprzewozn): URL /v3 suffix is required until Horizon bug #2073639 is resolved
+OPENSTACK_KEYSTONE_URL = "{{ horizon_keystone_url }}/v3"
 OPENSTACK_KEYSTONE_DEFAULT_ROLE = "{{ keystone_default_user_role }}"
 
 {% if enable_keystone_federation | bool %}

diff --git a/ansible/roles/swift/tasks/start.yml b/ansible/roles/swift/tasks/start.yml
@@ -60,6 +60,7 @@
       - "{{ node_config_directory }}/swift-account-server/:{{ container_config_directory }}/:ro"
       - "{{ swift_devices_mount_point }}:{{ swift_devices_mount_point }}:shared"
       - "/etc/localtime:/etc/localtime:ro"
+      - "swift_recon_cache:/var/cache/swift"
   when: inventory_hostname in groups['swift-account-server']
 
 - name: Starting swift-account-auditor container
@@ -138,6 +139,7 @@
       - "{{ node_config_directory }}/swift-container-server/:{{ container_config_directory }}/:ro"
       - "{{ swift_devices_mount_point }}:{{ swift_devices_mount_point }}:shared"
       - "/etc/localtime:/etc/localtime:ro"
+      - "swift_recon_cache:/var/cache/swift"
   when: inventory_hostname in groups['swift-container-server']
 
 - name: Starting swift-container-auditor container

diff --git a/releasenotes/notes/bug-2073159-c54c773c72c8fb11.yaml b/releasenotes/notes/bug-2073159-c54c773c72c8fb11.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes behaviour of Change Password screen in Horizon until
+    `bug #2073639 <https://launchpad.net/bugs/2073639>`__ is resolved.
+    `LP#2073159 <https://launchpad.net/bugs/2073159>`__
diff --git a/releasenotes/notes/bug-923105-d451a78930973a82.yaml b/releasenotes/notes/bug-923105-d451a78930973a82.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Fixes the Python requests library issue when using custom
+    CA by adding the REQUESTS_CA environment variable to the
+    kolla-toolbox container.
+    See `LP#1967132 <https://launchpad.net/bugs/1967132>`__
diff --git a/releasenotes/notes/kolla-toolbox-demux-c5e8d27bc7214069.yaml b/releasenotes/notes/kolla-toolbox-demux-c5e8d27bc7214069.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes parsing of JSON output of inner modules called by ``kolla-toolbox``
+    when data was returned on standard error.
+    `LP#2080544 <https://launchpad.net/bugs/2080544>`__