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/ceilometer/ceilometer-compute/Dockerfile.j2 | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'docker/ceilometer') diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 index e587ad861..bd0aa4c6b 100644 --- a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 @@ -20,9 +20,15 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% elif install_type == 'source' %} {% if base_package_type == 'rpm' %} - {% set ceilometer_compute_packages = [ - 'libvirt-python' - ] %} + {% if distro_python_version.startswith('3') %} + {% set ceilometer_compute_packages = [ + 'python3-libvirt' + ] %} + {% else %} + {% set ceilometer_compute_packages = [ + 'libvirt-python' + ] %} + {% endif %} {% elif base_package_type == 'deb' %} {% set ceilometer_compute_packages = [ 'python3-libvirt' -- cgit v1.2.3