diff options
| author | Maciej Kucia <maciej@kucia.net> | 2018-10-28 23:14:49 +0100 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2020-02-24 14:23:36 +0000 |
| commit | 42ffd3b680e702060cb9ae71d10cb4d596b25002 (patch) | |
| tree | 99ffa186dc6ea2559cb932326e0bf18652cd67eb /docker/cinder | |
| parent | ea8f03da6efe48665d56fdefd8aac37f9dee145d (diff) | |
| download | kolla-42ffd3b680e702060cb9ae71d10cb4d596b25002.tar.gz kolla-42ffd3b680e702060cb9ae71d10cb4d596b25002.zip | |
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)
Diffstat (limited to 'docker/cinder')
| -rw-r--r-- | docker/cinder/cinder-volume/Dockerfile.j2 | 3 |
1 files changed, 2 insertions, 1 deletions
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' %} |