aboutsummaryrefslogtreecommitdiff
path: root/docker/manila
diff options
context:
space:
mode:
authorMark Goddard <mark@stackhpc.com>2019-06-05 17:16:49 +0100
committerMark Goddard <mark@stackhpc.com>2019-06-06 11:06:58 +0000
commitaa59f0db6f88ed0a03169b473fdf6d541d34df9f (patch)
treed5d2bc3512d17f88a052f652a7d0d073f61fe47c /docker/manila
parent4e083196d14877de458ae16129331c37fe1f6f21 (diff)
downloadkolla-aa59f0db6f88ed0a03169b473fdf6d541d34df9f.tar.gz
kolla-aa59f0db6f88ed0a03169b473fdf6d541d34df9f.zip
Debian/Ubuntu: more python3 packages for binary
backport: Stein During the switch to Stein UCA, we did not switch all packages to python 3 for Debian/Ubuntu binary images. This change switches some more of those packages. Change-Id: I0bff21384d88ea678608392de2db1ba418c96665 Co-Authored-By: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Diffstat (limited to 'docker/manila')
-rw-r--r--docker/manila/manila-api/Dockerfile.j22
-rw-r--r--docker/manila/manila-share/Dockerfile.j22
2 files changed, 3 insertions, 1 deletions
diff --git a/docker/manila/manila-api/Dockerfile.j2 b/docker/manila/manila-api/Dockerfile.j2
index 8e6f30080..abd3ae573 100644
--- a/docker/manila/manila-api/Dockerfile.j2
+++ b/docker/manila/manila-api/Dockerfile.j2
@@ -25,7 +25,7 @@ RUN mkdir -p /var/www/cgi-bin/manila \
{% elif base_package_type == 'deb' %}
{% set manila_api_packages = [
'apache2',
- 'libapache2-mod-wsgi',
+ 'libapache2-mod-wsgi-py3',
'manila-api'
] %}
{{ macros.install_packages(manila_api_packages | customizable("packages")) }}
diff --git a/docker/manila/manila-share/Dockerfile.j2 b/docker/manila/manila-share/Dockerfile.j2
index cf58a36f0..bdd08fb65 100644
--- a/docker/manila/manila-share/Dockerfile.j2
+++ b/docker/manila/manila-share/Dockerfile.j2
@@ -17,6 +17,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% set manila_share_packages = [
'manila-share',
'ceph-common',
+ 'python3-rados',
+ 'python3-rbd',
'sqlite3'
] %}