openstack/kolla
Code Issues Proposed changes

Always use the distro-provided libvirt-python

Browse Source 
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
This commit is contained in:
Radosław Piliszek 2021-08-18 09:44:31 +00:00
parent 6e23ef8f2a
commit 72fcc0f8ef
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/masakari/masakari-monitors/Dockerfile.j2
View File

@ -35,7 +35,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}
{% set masakari_monitors_packages = [ {% set masakari_monitors_packages = [
'libvirt-devel', 'python3-libvirt',
'pacemaker-cli', 'pacemaker-cli',
'tcpdump', 'tcpdump',
] %} ] %}
@ -43,7 +43,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% elif base_package_type == 'deb' %} {% elif base_package_type == 'deb' %}
{% set masakari_monitors_packages = [ {% set masakari_monitors_packages = [
'libvirt-dev', 'python3-libvirt',
'pacemaker-cli-utils', 'pacemaker-cli-utils',
'tcpdump', 'tcpdump',
] %} ] %}