diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2019-03-08 18:50:14 +0100 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2019-06-06 11:59:03 +0100 |
| commit | d436001b43f0a7e3c161ac4a2c5d09d36c6f1015 (patch) | |
| tree | 84dc7758ef31ce9ef0871b73a489985ffee455ce /docker/cloudkitty | |
| parent | 4926adb62465bf819fca2dacd42454d4e9eb74df (diff) | |
| download | kolla-d436001b43f0a7e3c161ac4a2c5d09d36c6f1015.tar.gz kolla-d436001b43f0a7e3c161ac4a2c5d09d36c6f1015.zip | |
Debian/Ubuntu: move to Python 3 for source images
Commit 43b74ccc157c0b50138c3785ed91dab504895571 enabled use of Python 3
based packages but not switched to use Python 3.
Some of images still contain Python 2. There are two reasons:
- Ceph (ceph-common depends on Py2)
- python3-ldappool on Ubuntu 18.04
In Ceph situation Py3 packages were added. For second one we can not do
anything - Py2 dependency got dropped in Ubuntu 18.10 version.
Removed neutron-server-plugin-networking-infoblox due to being not
maintained. Once https://review.opendev.org/#/c/657578/ get merged
someone may revert that part.
Implements: blueprint debian-ubuntu-python3
Depends-on: Ie2a1077f7def0743f1403341985e2109aa490026
Change-Id: Ibfe0c2b8be98db56c61f74fb0247488ab3749ef4
Diffstat (limited to 'docker/cloudkitty')
| -rw-r--r-- | docker/cloudkitty/cloudkitty-api/Dockerfile.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 index 95656dbc7..cc662773d 100644 --- a/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 +++ b/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 @@ -48,7 +48,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ {% elif base_package_type == 'deb' %} {% set cloudkitty_api_packages = [ 'apache2', - 'libapache2-mod-wsgi' + 'libapache2-mod-wsgi-py3' ] %} {{ macros.install_packages(cloudkitty_api_packages | customizable("packages")) }} RUN echo > /etc/apache2/ports.conf |