openstack/kolla
Code Issues Proposed changes

Install uwsgi in Centos binary

Browse Source 
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
This commit is contained in:
Magnus Lööf 2017-02-18 10:26:04 +01:00
parent ae4318ff0c
commit df2e5d5e23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker/barbican/barbican-api/Dockerfile.j2
View File

@ -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',