diff options
| author | Zuul <zuul@review.opendev.org> | 2020-05-08 19:07:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-05-08 19:07:46 +0000 |
| commit | f7670cdc6d838e55b988889ffa06b51aa9e3cb24 (patch) | |
| tree | ab6a1689c3d5429f8c881f709147f55a8ba2d387 | |
| parent | fe6fd8dc5d1809f8ce91f677f6affd4e21268551 (diff) | |
| parent | f5d31da12fa66cedfc2e270b8cd3be8e2bb9254b (diff) | |
| download | kolla-f7670cdc6d838e55b988889ffa06b51aa9e3cb24.tar.gz kolla-f7670cdc6d838e55b988889ffa06b51aa9e3cb24.zip | |
Merge "Use Python 3 for mod_wsgi in cyborg and monasca on Debian/Ubuntu"
| -rw-r--r-- | docker/cyborg/cyborg-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/monasca/monasca-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | releasenotes/notes/fix-monasca-cyborg-ubuntu-source-832a978a3ac5cd3e.yaml | 6 |
3 files changed, 8 insertions, 2 deletions
diff --git a/docker/cyborg/cyborg-api/Dockerfile.j2 b/docker/cyborg/cyborg-api/Dockerfile.j2 index 71081f875..512047882 100644 --- a/docker/cyborg/cyborg-api/Dockerfile.j2 +++ b/docker/cyborg/cyborg-api/Dockerfile.j2 @@ -20,7 +20,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 e4ccf449f..8ddc63d21 100644 --- a/docker/monasca/monasca-base/Dockerfile.j2 +++ b/docker/monasca/monasca-base/Dockerfile.j2 @@ -30,7 +30,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 000000000..802711a82 --- /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 <https://bugs.launchpad.net/kolla-ansible/+bug/1873421>`__ |