diff options
| author | Zuul <zuul@review.opendev.org> | 2020-01-22 15:09:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-01-22 15:09:16 +0000 |
| commit | 46b944a1420fbaffc33fbac563226d832df9dcfb (patch) | |
| tree | 6287766c573f3cf7da0c59f24ff5478d7d431da9 | |
| parent | 35052b18eabaf70c468a197f6906c81281dc5014 (diff) | |
| parent | 6632c5cf52d10e714468198b188dd9975dcba36f (diff) | |
| download | kolla-46b944a1420fbaffc33fbac563226d832df9dcfb.tar.gz kolla-46b944a1420fbaffc33fbac563226d832df9dcfb.zip | |
Merge "Fixes swift-object-expirer for Debian and Ubuntu binary images." into stable/train
| -rw-r--r-- | docker/swift/swift-object-expirer/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | releasenotes/notes/swift-object-expirer-fix-b837de80cea4fb8e.yaml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/docker/swift/swift-object-expirer/Dockerfile.j2 b/docker/swift/swift-object-expirer/Dockerfile.j2 index 82ae2249c..bbca2617a 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 000000000..255acf26e --- /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 <https://bugs.launchpad.net/kolla/+bug/1859607>`__ |