Add Apache packages to cinder-api container

Some projects that use Kolla docker containers (TripleO) run cinder-api under
httpd. This patch adds the httpd package so that it exists in the container
and can optionally by used via Docker entrypoints.

As many of these projects do not require the use of Apache (it is opt-in) at
this point not all deployment frameworks support the use of it so
the existing configuration defaults have been left as-is for now.

Partial-Blueprint: apache-packages-for-apis

Change-Id: Ibf9665c268465971f92218833542e20623d1d296

1 files changed, 27 insertions, 2 deletions

diff --git a/docker/cinder/cinder-api/Dockerfile.j2 b/docker/cinder/cinder-api/Dockerfile.j2
index fe343fea3..cbedd9fd4 100644
--- a/docker/cinder/cinder-api/Dockerfile.j2
+++ b/docker/cinder/cinder-api/Dockerfile.j2
@@ -9,14 +9,39 @@ MAINTAINER {{ maintainer }}
     {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
 
         {% set cinder_api_packages = [
-                'python-keystone'
+                'python-keystone',
+                'httpd',
+                'mod_wsgi'
         ] %}
 
 
     {% elif base_distro in ['ubuntu'] %}
 
         {% set cinder_api_packages = [
-                'cinder-api'
+                'cinder-api',
+                'apache2',
+                'libapache2-mod-wsgi'
+        ] %}
+
+    {% endif %}
+
+{{ macros.install_packages(cinder_api_packages | customizable("packages")) }}
+
+{% elif install_type == 'source' %}
+
+    {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+
+        {% set cinder_api_packages = [
+                'httpd',
+                'mod_wsgi'
+        ] %}
+
+
+    {% elif base_distro in ['ubuntu'] %}
+
+        {% set cinder_api_packages = [
+                'apache2',
+                'libapache2-mod-wsgi'
         ] %}
 
     {% endif %}