From 42ffd3b680e702060cb9ae71d10cb4d596b25002 Mon Sep 17 00:00:00 2001
From: Maciej Kucia <maciej@kucia.net>
Date: Sun, 28 Oct 2018 23:14:49 +0100
Subject: Remove tgtd and scsi-target-utils support in CentOS/RHEL 8

In CentOS/RHEL 8 there is no scsi-target-utils package, nor is it
available in EPEL. In RHEL 7 and beyond the LIO kernel subsystem can be
used instead of the tgtd daemon.

This change removes support for the SCSI target daemon on CentOS/RHEL 8.
The 'tgtd' image is no longer available for CentOS/RHEL 8.

Change-Id: I56f230d66f75dd0546325676278f91579f08c822
Signed-off-by: Maciej Kucia <maciej@kucia.net>
Co-Authored-By: Maciej Kucia <maciej@kucia.net>
Co-Authored-By: Mark Goddard <mark@stackhpc.com>
Related: blueprint centos-rhel-8
Depends-On: https://review.opendev.org/#/c/702417
(cherry picked from commit 946749312f31c36d9dac8ff3a545894e9043190d)
---
 docker/base/Dockerfile.j2                                    | 12 ++++++++++--
 docker/cinder/cinder-volume/Dockerfile.j2                    |  3 ++-
 docker/tgtd/Dockerfile.j2                                    |  7 +++++--
 .../deprecate-tgtd-scsi-target-utils-3ee002b832382f14.yaml   |  7 +++++++
 4 files changed, 24 insertions(+), 5 deletions(-)
 create mode 100644 releasenotes/notes/deprecate-tgtd-scsi-target-utils-3ee002b832382f14.yaml

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 119b043b1..6a7ea3f33 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -236,7 +236,6 @@ RUN yum-config-manager --enable rhel-7-server-optional-rpms \
         'lvm2',
         'ncurses',
         'procps-ng',
-        'scsi-target-utils',
         'socat',
         'sudo',
         'which'
@@ -250,6 +249,11 @@ RUN yum-config-manager --enable rhel-7-server-optional-rpms \
         'python'
 ] %}
 {% endif %}
+{% if distro_package_manager == 'yum' %}
+    {% set base_centos_binary_packages = base_centos_binary_packages + [
+        'scsi-target-utils',
+    ] %}
+{% endif %}
 
 # Install base packages
 {{ macros.install_packages( base_centos_binary_packages | customizable("centos_binary_packages")) }}
@@ -266,12 +270,16 @@ RUN yum-config-manager --enable rhel-7-server-optional-rpms \
     'lvm2',
     'ncurses',
     'procps-ng',
-    'scsi-target-utils',
     'socat',
     'sudo',
     'tar',
     'which'
 ] %}
+{% if distro_package_manager == 'yum' %}
+    {% set base_centos_source_packages = base_centos_source_packages + [
+        'scsi-target-utils',
+    ] %}
+{% endif %}
 # Update packages
 {{ macros.install_packages( base_centos_source_packages | customizable("centos_source_packages")) }}
 
diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2
index c6f07ec29..a65718bbc 100644
--- a/docker/cinder/cinder-volume/Dockerfile.j2
+++ b/docker/cinder/cinder-volume/Dockerfile.j2
@@ -9,7 +9,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
     {% set cinder_volume_packages = [
             'nfs-utils',
             'nvmetcli',
-            'scsi-target-utils',
             'sysfsutils',
             'targetcli'
     ] %}
@@ -26,7 +25,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {{ macros.install_packages(cinder_volume_packages | customizable("packages")) }}
 
 {% block cinder_volume_redhat_setup %}
+{% if distro_package_manager == 'yum' %}
 RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/tgtd.conf
+{% endif %}
 {% endblock %}
 
 {% elif base_package_type == 'deb' %}
diff --git a/docker/tgtd/Dockerfile.j2 b/docker/tgtd/Dockerfile.j2
index 48f7dc4b1..a2f322247 100644
--- a/docker/tgtd/Dockerfile.j2
+++ b/docker/tgtd/Dockerfile.j2
@@ -6,10 +6,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% import "macros.j2" as macros with context %}
 
 {% if base_package_type == 'rpm' %}
-    {% set tgtd_packages = ['scsi-target-utils'] %}
 
-{{ macros.install_packages(tgtd_packages | customizable("packages")) }}
+{% if distro_package_manager == 'dnf' %}
+RUN echo 'Not available for {{ base_distro }}' \
+    && /bin/false
+{% else %}
 RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/tgtd.conf
+{% endif %}
 
 {% elif base_package_type == 'deb' %}
     {% set tgtd_packages = ['tgt'] %}
diff --git a/releasenotes/notes/deprecate-tgtd-scsi-target-utils-3ee002b832382f14.yaml b/releasenotes/notes/deprecate-tgtd-scsi-target-utils-3ee002b832382f14.yaml
new file mode 100644
index 000000000..e32445c5b
--- /dev/null
+++ b/releasenotes/notes/deprecate-tgtd-scsi-target-utils-3ee002b832382f14.yaml
@@ -0,0 +1,7 @@
+---
+upgrade:
+  - |
+    Support for the SCSI target daemon (``tgtd``) has been removed for
+    CentOS/RHEL 8.  In CentOS/RHEL 7 and beyond LIO kernel subsystem can be
+    used instead of the ``tgtd`` daemon. The ``tgtd`` image is no longer
+    available for CentOS/RHEL 8.
-- 
cgit v1.2.3