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/base | |
| 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/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 12 |
1 files changed, 10 insertions, 2 deletions
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")) }} |