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/iscsid/Dockerfile.j2 | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'docker/iscsid/Dockerfile.j2') diff --git a/docker/iscsid/Dockerfile.j2 b/docker/iscsid/Dockerfile.j2 index 49bccd576..71799e229 100644 --- a/docker/iscsid/Dockerfile.j2 +++ b/docker/iscsid/Dockerfile.j2 @@ -10,19 +10,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_package_type == 'rpm' %} {% set iscsid_packages = [ 'iscsi-initiator-utils', + 'python3-rtslib', 'targetcli' ] %} - {% if distro_python_version.startswith('3') %} - {% set iscsid_packages = iscsid_packages + [ - 'python3-rtslib' - ] %} - {% else %} - {% set iscsid_packages = iscsid_packages + [ - 'python-rtslib' - ] %} - {% endif %} - {% elif base_package_type == 'deb' %} {% set iscsid_packages = [ 'open-iscsi', -- cgit v1.2.3