From 6632c5cf52d10e714468198b188dd9975dcba36f Mon Sep 17 00:00:00 2001 From: Dincer Celik Date: Sun, 19 Jan 2020 22:47:10 +0300 Subject: [PATCH] Fixes swift-object-expirer for Debian and Ubuntu binary images. Replaces 'swift-object' package with 'swift-object-expirer' package. Change-Id: I8fa3fcad88b35743e042d8a62ccee722b08af673 Closes-Bug: #1859607 (cherry picked from commit 190a6f7a264c1ea8c0c565d2b75fb73fdc29d500) --- docker/swift/swift-object-expirer/Dockerfile.j2 | 2 +- .../notes/swift-object-expirer-fix-b837de80cea4fb8e.yaml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/swift-object-expirer-fix-b837de80cea4fb8e.yaml diff --git a/docker/swift/swift-object-expirer/Dockerfile.j2 b/docker/swift/swift-object-expirer/Dockerfile.j2 index 82ae2249c0..bbca2617af 100644 --- a/docker/swift/swift-object-expirer/Dockerfile.j2 +++ b/docker/swift/swift-object-expirer/Dockerfile.j2 @@ -10,7 +10,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build # RDO packages swift-object-expirer in openstack-swift-proxy {% set swift_object_expirer_packages = ['openstack-swift-proxy'] %} {% elif base_package_type == 'deb' %} - {% set swift_object_expirer_packages = ['swift-object'] %} + {% set swift_object_expirer_packages = ['swift-object-expirer'] %} {% endif %} {{ macros.install_packages(swift_object_expirer_packages | customizable("packages")) }} diff --git a/releasenotes/notes/swift-object-expirer-fix-b837de80cea4fb8e.yaml b/releasenotes/notes/swift-object-expirer-fix-b837de80cea4fb8e.yaml new file mode 100644 index 0000000000..255acf26e8 --- /dev/null +++ b/releasenotes/notes/swift-object-expirer-fix-b837de80cea4fb8e.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Fixes swift-object-expirer for Debian and Ubuntu binary images. + `LP#1859607 `__