aboutsummaryrefslogtreecommitdiff
path: root/docker/iscsid/Dockerfile.j2
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-04-15 14:02:57 +0000
committerGerrit Code Review <review@openstack.org>2020-04-15 14:02:57 +0000
commit2f66efdf5e2cef7cf5ca8b44759003c14a103ecf (patch)
tree6f3a7cb6ac940ee6e376552250f4524ce9b9125b /docker/iscsid/Dockerfile.j2
parent4cbb9a5bfdd906c6ebc4c2fc5b0ac4431602bee4 (diff)
parent53443c5c712f4ec23b859105e94bcd90abc27762 (diff)
downloadkolla-2f66efdf5e2cef7cf5ca8b44759003c14a103ecf.tar.gz
kolla-2f66efdf5e2cef7cf5ca8b44759003c14a103ecf.zip
Merge "Remove support for CentOS 7"
Diffstat (limited to 'docker/iscsid/Dockerfile.j2')
-rw-r--r--docker/iscsid/Dockerfile.j211
1 files changed, 1 insertions, 10 deletions
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',