openstack
/
kolla
Code Issues Proposed changes

Merge "Clarify comment about swift-object-expirer for RDO"

This commit is contained in:
Jenkins 2017-06-09 10:42:18 +00:00 committed by Gerrit Code Review
parent 9cd2162856 f0f4e70f1e
commit 142c3b839e
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,8 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
# RDO has it packaged in the wrong package for now. The issue is being
# tracked in https://bugzilla.redhat.com/show_bug.cgi?id=1382921
# RDO packages swift-object-expirer in openstack-swift-proxy
{% set swift_object_expirer_packages = ['openstack-swift-proxy'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set swift_object_expirer_packages = ['swift-object'] %}