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/kolla-toolbox/Dockerfile.j2 | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'docker/kolla-toolbox') diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index d4ad59f03..6486e882d 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -30,9 +30,20 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'mariadb-devel', 'openssh-clients', 'openssl-devel', - 'python-devel', - 'rabbitmq-server-3.7.10', ] %} + {% if distro_package_manager == 'dnf' %} + {% set kolla_toolbox_packages = kolla_toolbox_packages + [ + 'python3-devel', + 'rabbitmq-server-3.7.*' + ] %} + {% else %} + # NOTE(mandre) Remove rabbitmq-server pinning once package dependencies are met + # https://bugs.launchpad.net/kolla/+bug/1814233 + {% set kolla_toolbox_packages = kolla_toolbox_packages + [ + 'python-devel', + 'rabbitmq-server-3.7.10' + ] %} + {% endif %} {% elif base_package_type == 'deb' %} {% set kolla_toolbox_packages = [ -- cgit v1.2.3