diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-06-09 10:42:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-06-09 10:42:18 +0000 |
| commit | 142c3b839ef9188197b5b5c968266c1ae7dce22d (patch) | |
| tree | 04edba261b72ec7ff6e89bbbbc00eb3a3e3ea7b9 | |
| parent | 9cd216285611e73569044b85d5c9ce9e89beeab3 (diff) | |
| parent | f0f4e70f1e440382482e45c14c3df1ebf9508780 (diff) | |
| download | kolla-142c3b839ef9188197b5b5c968266c1ae7dce22d.tar.gz kolla-142c3b839ef9188197b5b5c968266c1ae7dce22d.zip | |
Merge "Clarify comment about swift-object-expirer for RDO"5.0.0.0b2
| -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'] %} |