Merge "Fixes swift-object-expirer for Debian and Ubuntu binary images." into stable/train
This commit is contained in:
commit
46b944a142
|
@ -10,7 +10,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
||||||
# RDO packages swift-object-expirer in openstack-swift-proxy
|
# RDO packages swift-object-expirer in openstack-swift-proxy
|
||||||
{% set swift_object_expirer_packages = ['openstack-swift-proxy'] %}
|
{% set swift_object_expirer_packages = ['openstack-swift-proxy'] %}
|
||||||
{% elif base_package_type == 'deb' %}
|
{% elif base_package_type == 'deb' %}
|
||||||
{% set swift_object_expirer_packages = ['swift-object'] %}
|
{% set swift_object_expirer_packages = ['swift-object-expirer'] %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{{ macros.install_packages(swift_object_expirer_packages | customizable("packages")) }}
|
{{ macros.install_packages(swift_object_expirer_packages | customizable("packages")) }}
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
fixes:
|
||||||
|
- |
|
||||||
|
Fixes swift-object-expirer for Debian and Ubuntu binary images.
|
||||||
|
`LP#1859607 <https://bugs.launchpad.net/kolla/+bug/1859607>`__
|
Loading…
Reference in New Issue