From 9c46a15e6472b531fcc658dcdfb13c97ff52c843 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Magnus=20L=C3=B6=C3=B6f?= <magnus.loof@basalt.se>
Date: Sat, 18 Feb 2017 10:26:04 +0100
Subject: [PATCH] Install uwsgi in Centos binary
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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
---
 docker/barbican/barbican-api/Dockerfile.j2 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docker/barbican/barbican-api/Dockerfile.j2 b/docker/barbican/barbican-api/Dockerfile.j2
index d9c122675c..442039e7d2 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', 'fedora', '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',