diff options
| author | Maciej Kucia <maciej@kucia.net> | 2018-10-28 23:14:49 +0100 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2020-01-09 16:29:42 +0000 |
| commit | 946749312f31c36d9dac8ff3a545894e9043190d (patch) | |
| tree | dffd1ecd52e0b1db6547e35d06bf01c11239f355 /docker/base | |
| parent | b060623b907348e518bdf1afede0b641be56c415 (diff) | |
| download | kolla-946749312f31c36d9dac8ff3a545894e9043190d.tar.gz kolla-946749312f31c36d9dac8ff3a545894e9043190d.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/631479/
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 48522109d..3001028fa 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -247,7 +247,6 @@ RUN yum-config-manager --enable rhel-7-server-optional-rpms \ 'lvm2', 'ncurses', 'procps-ng', - 'scsi-target-utils', 'socat', 'sudo', 'tar', @@ -262,6 +261,11 @@ RUN yum-config-manager --enable rhel-7-server-optional-rpms \ 'python' ] %} {% endif %} +{% if distro_package_manager == 'yum' %} + {% set base_centos_packages = base_centos_packages + [ + 'scsi-target-utils', + ] %} +{% endif %} # Install base packages {{ macros.install_packages( base_centos_packages | customizable("centos_packages") | customizable("centos_binary_packages") | customizable("centos_source_packages") ) }} |