From 72fcc0f8ef382f4118d6a901d0ef8bba445716a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Wed, 18 Aug 2021 09:44:31 +0000 Subject: [PATCH] Always use the distro-provided libvirt-python This patch switches masakari-monitors image to follow nova-compute and ceilometer-compute images. This will be used and required after [1] merges. Usage of libvirt-python from PyPI has already proven to be problematic on CentOS Stream in our stable branches. [2] With this patch we avoid those issues as well. [1] https://review.opendev.org/c/openstack/masakari-monitors/+/804913 [2] https://review.opendev.org/c/openstack/kolla/+/797102 Depends-On: https://review.opendev.org/c/openstack/masakari-monitors/+/804913 Change-Id: I7d4788f5b63fba24e3b2f9b15c16866ff811d83e --- docker/masakari/masakari-monitors/Dockerfile.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/masakari/masakari-monitors/Dockerfile.j2 b/docker/masakari/masakari-monitors/Dockerfile.j2 index 3a48e1cbf0..62da6fcfe0 100644 --- a/docker/masakari/masakari-monitors/Dockerfile.j2 +++ b/docker/masakari/masakari-monitors/Dockerfile.j2 @@ -35,7 +35,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_package_type == 'rpm' %} {% set masakari_monitors_packages = [ - 'libvirt-devel', + 'python3-libvirt', 'pacemaker-cli', 'tcpdump', ] %} @@ -43,7 +43,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% elif base_package_type == 'deb' %} {% set masakari_monitors_packages = [ - 'libvirt-dev', + 'python3-libvirt', 'pacemaker-cli-utils', 'tcpdump', ] %}