Merge pull request #313 from stackhpc/upstream/yoga-2024-05-13

Synchronise yoga with upstream
stackhpc · May 13, 2024 · 217322a · 217322a
2 parents ebe816a + f91b041
commit 217322a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2
@@ -23,7 +23,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'ndctl',
             'nfs-utils',
             'openstack-nova-compute',
-            'openvswitch',
             'parted',
             'python3-libguestfs',
             'python3-oslo-vmware',
@@ -107,7 +106,6 @@ RUN rm -f /etc/nova/nova-compute.conf
             'ndctl',
             'nfs-utils',
             'nvme-cli',
-            'openvswitch',
             'parted',
             'python3-libguestfs',
             'python3-libvirt',

diff --git a/docker/swift/swift-base/Dockerfile.j2 b/docker/swift/swift-base/Dockerfile.j2
@@ -13,6 +13,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
     {% if base_package_type == 'rpm' %}
         {% set swift_base_packages = [
             'nmap-ncat',
+            'rsync',
             'openstack-swift',
         ] %}
     {% elif base_package_type == 'deb' %}

diff --git a/releasenotes/notes/fix_rsync_rpm_swift_base_missing-9d106d94b52d0bad.yaml b/releasenotes/notes/fix_rsync_rpm_swift_base_missing-9d106d94b52d0bad.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixes a bug where the ``rsync`` RPM package was missing in the ``swift-base`` container.
+    See `bug 2062072 <https://bugs.launchpad.net/kolla/+bug/2062072>`__ for details.