diff options
| author | Martin André <m.andre@redhat.com> | 2017-06-09 08:27:43 +0200 |
|---|---|---|
| committer | Martin André <m.andre@redhat.com> | 2017-06-09 08:27:43 +0200 |
| commit | f0f4e70f1e440382482e45c14c3df1ebf9508780 (patch) | |
| tree | d487b3c61106ea684e889d596643dcaab9d07901 /docker | |
| parent | 731dfcb40adb5e06210a7235172f5929c5b2edae (diff) | |
| download | kolla-f0f4e70f1e440382482e45c14c3df1ebf9508780.tar.gz kolla-f0f4e70f1e440382482e45c14c3df1ebf9508780.zip | |
Clarify comment about swift-object-expirer for RDO
The rational for packaging swift-object-expirer in
openstack-swift-proxy is detailed in
https://bugzilla.redhat.com/show_bug.cgi?id=1382921
It is a conscious packaging choice and not a bug, and as so update the
comment in swift-object-expirer image.
Change-Id: Ibccfa1482d3aeccf86a57603d9dedecbcc7d097c
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/swift/swift-object-expirer/Dockerfile.j2 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/docker/swift/swift-object-expirer/Dockerfile.j2 b/docker/swift/swift-object-expirer/Dockerfile.j2 index ef1d8b2f5..2e2b5c420 100644 --- a/docker/swift/swift-object-expirer/Dockerfile.j2 +++ b/docker/swift/swift-object-expirer/Dockerfile.j2 @@ -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'] %} |
