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/631479/
This commit is contained in:

committed by
Mark Goddard

parent
b060623b90
commit
946749312f
@@ -247,7 +247,6 @@ RUN yum-config-manager --enable rhel-7-server-optional-rpms \
|
|||||||
'lvm2',
|
'lvm2',
|
||||||
'ncurses',
|
'ncurses',
|
||||||
'procps-ng',
|
'procps-ng',
|
||||||
'scsi-target-utils',
|
|
||||||
'socat',
|
'socat',
|
||||||
'sudo',
|
'sudo',
|
||||||
'tar',
|
'tar',
|
||||||
@@ -262,6 +261,11 @@ RUN yum-config-manager --enable rhel-7-server-optional-rpms \
|
|||||||
'python'
|
'python'
|
||||||
] %}
|
] %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
{% if distro_package_manager == 'yum' %}
|
||||||
|
{% set base_centos_packages = base_centos_packages + [
|
||||||
|
'scsi-target-utils',
|
||||||
|
] %}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
# Install base packages
|
# Install base packages
|
||||||
{{ macros.install_packages( base_centos_packages | customizable("centos_packages") | customizable("centos_binary_packages") | customizable("centos_source_packages") ) }}
|
{{ macros.install_packages( base_centos_packages | customizable("centos_packages") | customizable("centos_binary_packages") | customizable("centos_source_packages") ) }}
|
||||||
|
@@ -9,7 +9,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
|||||||
{% set cinder_volume_packages = [
|
{% set cinder_volume_packages = [
|
||||||
'nfs-utils',
|
'nfs-utils',
|
||||||
'nvmetcli',
|
'nvmetcli',
|
||||||
'scsi-target-utils',
|
|
||||||
'sysfsutils',
|
'sysfsutils',
|
||||||
'targetcli'
|
'targetcli'
|
||||||
] %}
|
] %}
|
||||||
@@ -26,7 +25,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
|||||||
{{ macros.install_packages(cinder_volume_packages | customizable("packages")) }}
|
{{ macros.install_packages(cinder_volume_packages | customizable("packages")) }}
|
||||||
|
|
||||||
{% block cinder_volume_redhat_setup %}
|
{% block cinder_volume_redhat_setup %}
|
||||||
|
{% if distro_package_manager == 'yum' %}
|
||||||
RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/tgtd.conf
|
RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/tgtd.conf
|
||||||
|
{% endif %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% elif base_package_type == 'deb' %}
|
{% elif base_package_type == 'deb' %}
|
||||||
|
@@ -6,10 +6,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
|||||||
{% import "macros.j2" as macros with context %}
|
{% import "macros.j2" as macros with context %}
|
||||||
|
|
||||||
{% if base_package_type == 'rpm' %}
|
{% 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
|
RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/tgtd.conf
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
{% elif base_package_type == 'deb' %}
|
{% elif base_package_type == 'deb' %}
|
||||||
{% set tgtd_packages = ['tgt'] %}
|
{% set tgtd_packages = ['tgt'] %}
|
||||||
|
@@ -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.
|
Reference in New Issue
Block a user