aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-10-11 10:53:13 +0000
committerGerrit Code Review <review@openstack.org>2016-10-11 10:53:13 +0000
commitbd1edb46f13a86fe93c3b22d89a94423891717a7 (patch)
treea41a7084d6baa1eb453954f0186d01c3712dcf84 /docker
parent24ec175f95ed38d8e3b85e1fe10ed1f1f3af987b (diff)
parentbf62341cedabc96d2d9a1d5350f6424ddba3249f (diff)
downloadkolla-bd1edb46f13a86fe93c3b22d89a94423891717a7.tar.gz
kolla-bd1edb46f13a86fe93c3b22d89a94423891717a7.zip
Merge "Add missing uwsgi for barbican-api Dockerfile"
Diffstat (limited to 'docker')
-rw-r--r--docker/barbican/barbican-api/Dockerfile.j25
1 files changed, 4 insertions, 1 deletions
diff --git a/docker/barbican/barbican-api/Dockerfile.j2 b/docker/barbican/barbican-api/Dockerfile.j2
index df83638e9..d9c122675 100644
--- a/docker/barbican/barbican-api/Dockerfile.j2
+++ b/docker/barbican/barbican-api/Dockerfile.j2
@@ -9,7 +9,10 @@ MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
{% set barbican_api_packages = ['openstack-barbican-api'] %}
{% elif base_distro in ['ubuntu'] %}
- {% set barbican_api_packages = ['barbican-api'] %}
+ {% set barbican_api_packages = [
+ 'uwsgi-plugin-python',
+ 'barbican-api'
+ ] %}
{% endif %}
{{ macros.install_packages(barbican_api_packages | customizable("packages")) }}