From e3e2da2e92302a7ba2eca2bc394529b0eeb24358 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Mon, 27 Jul 2020 10:29:01 +0100 Subject: Fix masakari-monitors image on CentOS 8 Train only. The version of libvirt-python allowed by upper-constraints in Train (5.7.0) does not support CentOS 8. This prevented the masakari-monitors image from building. This change modifies the upper constraints file in the masakari-monitors image to use 5.10.0, the earliest version that does support CentOS 8. Change-Id: Ia980be14fdf9c4fc15bb379b940ae491de035725 --- docker/masakari/masakari-monitors/Dockerfile.j2 | 1 + kolla/image/build.py | 1 - .../notes/fix-masakari-monitors-centos8-6b030ab9531505be.yaml | 4 ++++ 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/fix-masakari-monitors-centos8-6b030ab9531505be.yaml diff --git a/docker/masakari/masakari-monitors/Dockerfile.j2 b/docker/masakari/masakari-monitors/Dockerfile.j2 index 2039b556a..149b733d9 100644 --- a/docker/masakari/masakari-monitors/Dockerfile.j2 +++ b/docker/masakari/masakari-monitors/Dockerfile.j2 @@ -41,6 +41,7 @@ ADD masakari-monitors-archive /masakari-monitors-source ] %} RUN ln -s masakari-monitors-source/* masakari-monitors \ + {% if distro_package_manager == 'dnf' %}&& sed -i -e 's/libvirt-python===.*/libvirt-python===5.10.0/' /requirements/upper-constraints.txt {% endif %}\ && {{ macros.install_pip(masakari_monitors_pip_packages | customizable("pip_packages")) }} \ && mkdir -p /etc/masakari-monitors \ && chown -R masakari: /etc/masakari-monitors diff --git a/kolla/image/build.py b/kolla/image/build.py index ff8c5e8ea..2a30bad12 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -167,7 +167,6 @@ UNBUILDABLE_IMAGES = { 'centos8+source': { "cyborg-agent", # opae-sdk does not support CentOS 8 - "masakari-monitors", # python-libvirt===5.7.0 fails }, 'debian': { diff --git a/releasenotes/notes/fix-masakari-monitors-centos8-6b030ab9531505be.yaml b/releasenotes/notes/fix-masakari-monitors-centos8-6b030ab9531505be.yaml new file mode 100644 index 000000000..721679dba --- /dev/null +++ b/releasenotes/notes/fix-masakari-monitors-centos8-6b030ab9531505be.yaml @@ -0,0 +1,4 @@ +--- +fixes: + - | + Fixes the ``masakari-monitors`` image on CentOS 8. -- cgit v1.2.3