From 63d566feaafd0cab6eeac9f88acd6ec7fc66b645 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Tue, 17 Dec 2019 13:01:42 +0000 Subject: CentOS 8: Update packages in images * Some further changes for python2 vs python3 packages * Allow rabbitmq 3.7.*, since a newer erlang is available * Switch from qemu-img-ev to qemu-img on CentOS 8 * bridge-utils no longer available on CentOS 8 * libvirt-daemon-driver-lxc no longer available on CentOS 8 * Mark some more images buildable for CentOS 8 Depends-On: https://review.opendev.org/709553 Change-Id: Iaf5b68ff6d944ae730ca0b1d5832172c106a6c08 Partially-Implements: blueprint centos-rhel-8 Partially-Implements: blueprint centos-rhel-python-3 (cherry picked from commit 4b4e26262b9e03190c639481fb60a8f4f92c532a) --- docker/cinder/cinder-base/Dockerfile.j2 | 6 +++--- docker/cinder/cinder-volume/Dockerfile.j2 | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'docker/cinder') diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2 index 4c015186e..bf2dc4fa7 100644 --- a/docker/cinder/cinder-base/Dockerfile.j2 +++ b/docker/cinder/cinder-base/Dockerfile.j2 @@ -48,13 +48,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'lvm2', 'cryptsetup', ] %} - {% if base_distro in ['centos'] %} + {% if distro_package_manager == 'dnf' or base_distro not in ['centos'] %} {% set cinder_base_packages = cinder_base_packages + [ - 'qemu-img-ev' + 'qemu-img' ] %} {% else %} {% set cinder_base_packages = cinder_base_packages + [ - 'qemu-img' + 'qemu-img-ev' ] %} {% endif %} {% elif base_package_type == 'deb' %} diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2 index a65718bbc..77748fd1a 100644 --- a/docker/cinder/cinder-volume/Dockerfile.j2 +++ b/docker/cinder/cinder-volume/Dockerfile.j2 @@ -12,7 +12,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'sysfsutils', 'targetcli' ] %} - {% if distro_python_version.startswith('3') %} {% set cinder_volume_packages = cinder_volume_packages + [ 'python3-rtslib', -- cgit v1.2.3