From 846e0494288f1f64a77ad6daff01d4857420299f Mon Sep 17 00:00:00 2001 From: gongnan Date: Fri, 27 Aug 2021 09:43:28 +0800 Subject: [PATCH] openeuler iscsid and tgtd support --- docker/iscsid/Dockerfile.j2 | 6 ++++++ docker/tgtd/Dockerfile.j2 | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/docker/iscsid/Dockerfile.j2 b/docker/iscsid/Dockerfile.j2 index dd5e7356..89defe27 100644 --- a/docker/iscsid/Dockerfile.j2 +++ b/docker/iscsid/Dockerfile.j2 @@ -12,6 +12,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'targetcli' ] %} +{% elif base_distro =='openeuler' %} + {% set iscsid_packages = [ + 'iscsi-initiator-utils', + 'python2-rtslib-fb', + ] %} + {% elif base_distro in ['debian', 'ubuntu'] %} {% set iscsid_packages = [ 'open-iscsi' diff --git a/docker/tgtd/Dockerfile.j2 b/docker/tgtd/Dockerfile.j2 index b15fc869..a5c71528 100644 --- a/docker/tgtd/Dockerfile.j2 +++ b/docker/tgtd/Dockerfile.j2 @@ -5,7 +5,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} -{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} +{% if base_distro in ['centos', 'oraclelinux', 'rhel', 'openeuler'] %} {% set tgtd_packages = ['scsi-target-utils'] %} {{ macros.install_packages(tgtd_packages | customizable("packages")) }} -- Gitee