diff options
| author | Mark Goddard <mark@stackhpc.com> | 2020-07-27 10:29:01 +0100 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2020-07-27 10:40:46 +0100 |
| commit | e3e2da2e92302a7ba2eca2bc394529b0eeb24358 (patch) | |
| tree | 9ff2170f3157904c172452c7a9f4ea389722a6e6 /docker | |
| parent | 102ae176bfaebf10c041bb5fbaa8fa62215a5801 (diff) | |
| download | kolla-e3e2da2e92302a7ba2eca2bc394529b0eeb24358.tar.gz kolla-e3e2da2e92302a7ba2eca2bc394529b0eeb24358.zip | |
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
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/masakari/masakari-monitors/Dockerfile.j2 | 1 |
1 files changed, 1 insertions, 0 deletions
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 |