summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2024-05-09 12:52:55 +0000
committerGerrit Code Review <review@openstack.org>2024-05-09 12:52:55 +0000
commit13949dd4f1799d89f7edd03cb01d5f323c563fdc (patch)
tree1936f02d32d3a05d506c328ad346229256eb6569
parent3161fed77fead8d49135d000be6aef9362c67163 (diff)
parente5d79ba457695ec8799bf613e0eca484813af4b4 (diff)
downloadkolla-13949dd4f1799d89f7edd03cb01d5f323c563fdc.tar.gz
kolla-13949dd4f1799d89f7edd03cb01d5f323c563fdc.zip
Merge "swift-base: fix rsync missing for rpm installs" into unmaintained/zed
-rw-r--r--docker/swift/swift-base/Dockerfile.j21
-rw-r--r--releasenotes/notes/fix_rsync_rpm_swift_base_missing-9d106d94b52d0bad.yaml5
2 files changed, 6 insertions, 0 deletions
diff --git a/docker/swift/swift-base/Dockerfile.j2 b/docker/swift/swift-base/Dockerfile.j2
index 7cd6bce08..21c775af5 100644
--- 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
{% set swift_base_packages = [
'liberasurecode-devel',
'nmap-ncat',
+ 'rsync',
] %}
{% elif base_package_type == 'deb' %}
{% set swift_base_packages = [
diff --git a/releasenotes/notes/fix_rsync_rpm_swift_base_missing-9d106d94b52d0bad.yaml b/releasenotes/notes/fix_rsync_rpm_swift_base_missing-9d106d94b52d0bad.yaml
new file mode 100644
index 000000000..127907e3b
--- /dev/null
+++ 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.