diff options
| author | Zuul <zuul@review.opendev.org> | 2020-04-15 14:02:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-04-15 14:02:57 +0000 |
| commit | 2f66efdf5e2cef7cf5ca8b44759003c14a103ecf (patch) | |
| tree | 6f3a7cb6ac940ee6e376552250f4524ce9b9125b /docker/swift | |
| parent | 4cbb9a5bfdd906c6ebc4c2fc5b0ac4431602bee4 (diff) | |
| parent | 53443c5c712f4ec23b859105e94bcd90abc27762 (diff) | |
| download | kolla-2f66efdf5e2cef7cf5ca8b44759003c14a103ecf.tar.gz kolla-2f66efdf5e2cef7cf5ca8b44759003c14a103ecf.zip | |
Merge "Remove support for CentOS 7"
Diffstat (limited to 'docker/swift')
| -rw-r--r-- | docker/swift/swift-proxy-server/Dockerfile.j2 | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/docker/swift/swift-proxy-server/Dockerfile.j2 b/docker/swift/swift-proxy-server/Dockerfile.j2 index b7d0f0bca..8a2b903ed 100644 --- a/docker/swift/swift-proxy-server/Dockerfile.j2 +++ b/docker/swift/swift-proxy-server/Dockerfile.j2 @@ -10,17 +10,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if install_type == 'binary' %} {% if base_package_type == 'rpm' %} {% set swift_proxy_server_packages = [ - 'openstack-swift-proxy' - ] %} - {% if distro_python_version.startswith('3') %} - {% set swift_proxy_server_packages = swift_proxy_server_packages + [ + 'openstack-swift-proxy', 'python3-ceilometermiddleware' ] %} - {% else %} - {% set swift_proxy_server_packages = swift_proxy_server_packages + [ - 'python-ceilometermiddleware' - ] %} - {% endif %} {% elif base_package_type == 'deb' %} {% if base_distro == 'debian' %} {% set swift_proxy_server_packages = [ |