diff options
| author | Dincer Celik <hello@dincercelik.com> | 2019-10-21 17:26:54 +0300 |
|---|---|---|
| committer | Dincer Celik <hello@dincercelik.com> | 2019-10-21 18:57:53 +0300 |
| commit | 823e45a6c909437a6530c9f34f9e4f5cce8ab79c (patch) | |
| tree | 8bab5fcba1ac8d74c80ef0d5665d234a9b294ea7 /docker | |
| parent | 3887db89af16822404c37e0ceabb76bb9614722a (diff) | |
| download | kolla-823e45a6c909437a6530c9f34f9e4f5cce8ab79c.tar.gz kolla-823e45a6c909437a6530c9f34f9e4f5cce8ab79c.zip | |
Fix python3 compatibility for barbican
Barbican refers to python3 but uwsgi refers to python2. This change
fixes this issue.
Change-Id: I508bb082a319955b3e008235e158eaa07a1e8a74
Closes-Bug: #1849128
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/barbican/barbican-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/barbican/barbican-base/Dockerfile.j2 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/barbican/barbican-api/Dockerfile.j2 b/docker/barbican/barbican-api/Dockerfile.j2 index e25e6fb05..a2bc60e46 100644 --- a/docker/barbican/barbican-api/Dockerfile.j2 +++ b/docker/barbican/barbican-api/Dockerfile.j2 @@ -35,7 +35,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ 'apache2', 'barbican-api', 'libapache2-mod-wsgi-py3', - 'uwsgi-plugin-python' + 'uwsgi-plugin-python3' ] %} {{ macros.install_packages(barbican_api_packages | customizable("packages")) }} diff --git a/docker/barbican/barbican-base/Dockerfile.j2 b/docker/barbican/barbican-base/Dockerfile.j2 index 4d6843d65..0cf9821c9 100644 --- a/docker/barbican/barbican-base/Dockerfile.j2 +++ b/docker/barbican/barbican-base/Dockerfile.j2 @@ -25,7 +25,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% endif %} {% elif base_package_type == 'deb' %} - {% set barbican_base_packages = ['uwsgi-plugin-python'] %} + {% set barbican_base_packages = ['uwsgi-plugin-python3'] %} {% endif %} {{ macros.install_packages(barbican_base_packages | customizable("packages")) }} |