From 10c26d90e9ebe4a47d9558dfd64cc6907a46dbf2 Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
Date: Mon, 9 Jan 2017 16:58:07 -0500
Subject: [PATCH] Add Apache packages to nova-api container

Some projects that use Kolla docker containers (TripleO) run nova-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: Id22da4626c659d8c9f457b71d9423e5fd9e8c25a
---
 docker/nova/nova-api/Dockerfile.j2 | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/docker/nova/nova-api/Dockerfile.j2 b/docker/nova/nova-api/Dockerfile.j2
index 13a3dd92c6..7c8436fd0e 100644
--- a/docker/nova/nova-api/Dockerfile.j2
+++ b/docker/nova/nova-api/Dockerfile.j2
@@ -9,14 +9,37 @@ MAINTAINER {{ maintainer }}
     {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
 
         {% set nova_api_packages = [
-            'openstack-nova-api'
+            'openstack-nova-api',
+            'httpd',
+            'mod_wsgi'
         ] %}
 
     {% elif base_distro in ['ubuntu'] %}
 
         {% set nova_api_packages = [
             'nova-api',
-            'python-memcache'
+            'python-memcache',
+            'apache2',
+            'libapache2-mod-wsgi'
+        ] %}
+
+    {% endif %}
+{{ macros.install_packages(nova_api_packages | customizable("packages")) }}
+
+{% elif install_type == 'source' %}
+
+    {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+
+        {% set nova_api_packages = [
+            'httpd',
+            'mod_wsgi'
+        ] %}
+
+    {% elif base_distro in ['ubuntu'] %}
+
+        {% set nova_api_packages = [
+            'apache2',
+            'libapache2-mod-wsgi'
         ] %}
 
     {% endif %}