Merge pull request #617 from stackhpc/upstream/yoga-2024-09-16

Synchronise yoga with upstream
stackhpc · Sep 16, 2024 · 493637b · 493637b
2 parents 7f60aad + c166cb6
commit 493637b
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 2 deletions.
diff --git a/ansible/library/kolla_toolbox.py b/ansible/library/kolla_toolbox.py
@@ -174,7 +174,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/defaults/main.yml b/ansible/roles/horizon/defaults/main.yml
@@ -117,7 +117,6 @@ horizon_default_volumes:
   - "/etc/localtime:/etc/localtime:ro"
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
   - "kolla_logs:/var/log/kolla/"
-  - "/tmp:/tmp"
 
 horizon_extra_volumes: "{{ default_extra_volumes }}"
 

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-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/harden_horizon_tmp_usage-0d690e49645b99a8.yaml b/releasenotes/notes/harden_horizon_tmp_usage-0d690e49645b99a8.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Removes the default `/tmp/` mountpoint from the horizon container. This
+    change is made to harden the container and prevent potential security
+    issues. For more information, see the Bug Report: `LP#2068126 <https://bugs.launchpad.net/kolla-ansible/+bug/2068126>`__.
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>`__
diff --git a/tox.ini b/tox.ini
@@ -2,6 +2,11 @@
 minversion = 3.18
 envlist = py38,linters
 ignore_basepython_conflict = True
+# Cap setuptools via virtualenv to prevent compatibility issue with yoga
+# branch's upper constraint of 'packaging' package (21.3).
+requires =
+  virtualenv<20.26.4
+  tox<4
 
 [testenv]
 basepython = python3