From 53443c5c712f4ec23b859105e94bcd90abc27762 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 9 Mar 2020 17:44:54 +0100 Subject: Remove support for CentOS 7 With the move to RHEL/CentOS 8 we no longer have Python 2 in our images so there is no need for checking which Python version (2.x or 3.x) is used inside of containers. We also no longer have to support yum as a value for distro_package_manager. Partially-Implements: blueprint centos-rhel-8 Change-Id: Ie45cf3465fedddbde7856961527421883ba3d5c9 --- docker/swift/swift-proxy-server/Dockerfile.j2 | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'docker/swift') 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 = [ -- cgit v1.2.3