From f221b4f7ab7745ee20c8e97d6a1a2d3c7e74f466 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Mon, 4 May 2020 10:32:47 +0100 Subject: [PATCH] Use Python 3 for mod_wsgi in cyborg and monasca on Debian/Ubuntu In Train kolla switched to Python 3 in Debian and Ubuntu source images. For services running under httpd with mod_wsgi, they should install libapache2-mod-wsgi-py3 rather than libapache2-mod-wsgi. This was done for most images, but cyborg and monasca were omitted. This change fixes that. Change-Id: I25cfa62dbf20490685617b4a4185bf95ab91725e Closes-Bug: #1873421 (cherry picked from commit f5d31da12fa66cedfc2e270b8cd3be8e2bb9254b) --- docker/cyborg/cyborg-api/Dockerfile.j2 | 2 +- docker/monasca/monasca-base/Dockerfile.j2 | 2 +- .../fix-monasca-cyborg-ubuntu-source-832a978a3ac5cd3e.yaml | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 releasenotes/notes/fix-monasca-cyborg-ubuntu-source-832a978a3ac5cd3e.yaml diff --git a/docker/cyborg/cyborg-api/Dockerfile.j2 b/docker/cyborg/cyborg-api/Dockerfile.j2 index 8e82f7179e..b856aa775d 100644 --- a/docker/cyborg/cyborg-api/Dockerfile.j2 +++ b/docker/cyborg/cyborg-api/Dockerfile.j2 @@ -18,7 +18,7 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% elif base_package_type == 'deb' %} {% set cyborg_api_packages = [ 'apache2', - 'libapache2-mod-wsgi' + 'libapache2-mod-wsgi-py3' ] %} {% endif %} diff --git a/docker/monasca/monasca-base/Dockerfile.j2 b/docker/monasca/monasca-base/Dockerfile.j2 index aa62f5ee33..404834aac6 100644 --- a/docker/monasca/monasca-base/Dockerfile.j2 +++ b/docker/monasca/monasca-base/Dockerfile.j2 @@ -32,7 +32,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ {% set monasca_base_packages = [ 'apache2', - 'libapache2-mod-wsgi', + 'libapache2-mod-wsgi-py3', 'librdkafka-dev' ] %} diff --git a/releasenotes/notes/fix-monasca-cyborg-ubuntu-source-832a978a3ac5cd3e.yaml b/releasenotes/notes/fix-monasca-cyborg-ubuntu-source-832a978a3ac5cd3e.yaml new file mode 100644 index 0000000000..802711a829 --- /dev/null +++ b/releasenotes/notes/fix-monasca-cyborg-ubuntu-source-832a978a3ac5cd3e.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Fixes an issue with Cyborg and Monasca APIs in Debian and Ubuntu source + type images. + `LP#1873421 `__