openstack/kolla
Code Issues Proposed changes

Merge "Use Python 3 for mod_wsgi in cyborg and monasca on Debian/Ubuntu"

Browse Source
This commit is contained in:
Zuul 2020-05-08 19:07:46 +00:00 committed by Gerrit Code Review
commit f7670cdc6d
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/cyborg/cyborg-api/Dockerfile.j2
View File

@ -20,7 +20,7 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
{% elif base_package_type == 'deb' %} {% elif base_package_type == 'deb' %}
{% set cyborg_api_packages = [ {% set cyborg_api_packages = [
'apache2', 'apache2',
'libapache2-mod-wsgi' 'libapache2-mod-wsgi-py3'
] %} ] %}
{% endif %} {% endif %}

2
docker/monasca/monasca-base/Dockerfile.j2
View File

@ -30,7 +30,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
{% set monasca_base_packages = [ {% set monasca_base_packages = [
'apache2', 'apache2',
'libapache2-mod-wsgi', 'libapache2-mod-wsgi-py3',
'librdkafka-dev' 'librdkafka-dev'
] %} ] %}

6
releasenotes/notes/fix-monasca-cyborg-ubuntu-source-832a978a3ac5cd3e.yaml Normal file
View File

@ -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>`__