openstack
/
kolla
Code Issues Proposed changes

Merge "Fixes swift-object-expirer for Debian and Ubuntu binary images." into stable/stein

This commit is contained in:
Zuul 2020-01-22 15:09:17 +00:00 committed by Gerrit Code Review
parent 0de137f866 d9c63d7b81
commit 2585b051ee
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/swift/swift-object-expirer/Dockerfile.j2
View File

@ -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")) }}

5
releasenotes/notes/swift-object-expirer-fix-b837de80cea4fb8e.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- |
Fixes swift-object-expirer for Debian and Ubuntu binary images.
`LP#1859607 <https://bugs.launchpad.net/kolla/+bug/1859607>`__