diff options
| author | Zuul <zuul@review.opendev.org> | 2020-01-10 12:58:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-01-10 12:58:52 +0000 |
| commit | 51e50430c6299b82fbeb76d632ef2bda6e8409aa (patch) | |
| tree | b4800e8d234f39bf731690fc5ac88c347ef9d58e /docker/base | |
| parent | 178df355c23590403c0be1fb73ea0ca41aa61305 (diff) | |
| parent | 946749312f31c36d9dac8ff3a545894e9043190d (diff) | |
| download | kolla-51e50430c6299b82fbeb76d632ef2bda6e8409aa.tar.gz kolla-51e50430c6299b82fbeb76d632ef2bda6e8409aa.zip | |
Merge "Remove tgtd and scsi-target-utils support in CentOS/RHEL 8"
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") ) }} |