diff options
| author | Zuul <zuul@review.opendev.org> | 2019-10-22 08:03:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-10-22 08:03:42 +0000 |
| commit | ec6e9b713dcf9e6d1d8907a469d6a58e1b76dc5e (patch) | |
| tree | deda719e0c9f581d6b206c00ba6aa831bc539772 | |
| parent | 837939b4e805f0655bae62f27c60359dd69b8040 (diff) | |
| parent | 823e45a6c909437a6530c9f34f9e4f5cce8ab79c (diff) | |
| download | kolla-ec6e9b713dcf9e6d1d8907a469d6a58e1b76dc5e.tar.gz kolla-ec6e9b713dcf9e6d1d8907a469d6a58e1b76dc5e.zip | |
Merge "Fix python3 compatibility for barbican"
| -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")) }} |