From 4b4e26262b9e03190c639481fb60a8f4f92c532a 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 Change-Id: Iaf5b68ff6d944ae730ca0b1d5832172c106a6c08 Partially-Implements: blueprint centos-rhel-8 Partially-Implements: blueprint centos-rhel-python-3 --- docker/glance/glance-api/Dockerfile.j2 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'docker/glance') diff --git a/docker/glance/glance-api/Dockerfile.j2 b/docker/glance/glance-api/Dockerfile.j2 index 9ac24070a..1b98f1efe 100644 --- a/docker/glance/glance-api/Dockerfile.j2 +++ b/docker/glance/glance-api/Dockerfile.j2 @@ -5,10 +5,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} -{% if base_distro in ['centos'] %} - {% set glance_api_packages = ['qemu-img-ev'] %} -{% elif base_distro == 'rhel' %} +{% if base_package_type == 'rpm' %} + {% if distro_package_manager == 'dnf' or base_distro not in ['centos'] %} {% set glance_api_packages = ['qemu-img'] %} + {% else %} + {% set glance_api_packages = ['qemu-img-ev'] %} + {% endif %} {% elif base_package_type == 'deb' %} {% set glance_api_packages = ['qemu-utils'] %} {% endif %} -- cgit v1.2.3