summaryrefslogtreecommitdiff
path: root/docker/barbican
diff options
context:
space:
mode:
authorMagnus Lööf <magnus.loof@basalt.se>2017-02-18 10:26:04 +0100
committerMagnus Lööf <magnus.loof@basalt.se>2017-02-19 14:29:19 +0100
commitdf2e5d5e23030de57824c4d46df7af1db462c511 (patch)
tree8a89fc35a2a5442ea28d761c22939878fc608697 /docker/barbican
parentae4318ff0c2ed302708f3b998a63c3fc0356849f (diff)
downloadkolla-df2e5d5e23030de57824c4d46df7af1db462c511.tar.gz
kolla-df2e5d5e23030de57824c4d46df7af1db462c511.zip
Install uwsgi in Centos binary
Installs `uwsgi-plugin-python` and dependencies in `barbican-api` image. This will resolve problems bootstrapping barbican-api with binary Centos images which otherwise fail to start due to: ``` Running command: 'uwsgi --master --emperor /etc/barbican/vassals --logto /var/log/kolla/barbican/barbican-api.log' /usr/local/bin/kolla_start: line 24: exec: uwsgi: not found ``` Tested with: ``` docker run --rm -ti --entrypoint=/bin/bash kolla/centos-binary-barbican-api:3.0.3 $ uwsgi *** Starting uWSGI 2.0.14 (64bit) on [Sat Feb 18 09:32:12 2017] *** compiled with version: 4.8.5 20150623 (Red Hat 4.8.5-11) on 13 January 2017 23:06:53 os: Linux-4.9.4-moby #1 SMP Wed Jan 18 17:04:43 UTC 2017 nodename: b9063757e276 machine: x86_64 clock source: unix pcre jit disabled ... ``` Closes-Bug: 1634010 Signed-off-by: Magnus Lööf <magnus.loof@basalt.se> Change-Id: I77613bbeb19d89e6a25e52f24f3275d309ceb032
Diffstat (limited to 'docker/barbican')
-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 bc019d446..c582b3561 100644
--- a/docker/barbican/barbican-api/Dockerfile.j2
+++ b/docker/barbican/barbican-api/Dockerfile.j2
@@ -7,7 +7,10 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
- {% set barbican_api_packages = ['openstack-barbican-api'] %}
+ {% set barbican_api_packages = [
+ 'openstack-barbican-api',
+ 'uwsgi-plugin-python'
+ ] %}
{% elif base_distro in ['ubuntu'] %}
{% set barbican_api_packages = [
'uwsgi-plugin-python',