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/cinder | |
| 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/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' %} |