From 76ab2b84f464ebe619bc5abc30d083187763642e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Andr=C3=A9?= <m.andre@redhat.com>
Date: Tue, 14 Mar 2017 17:15:27 +0100
Subject: [PATCH] Add Apache packages to heat containers

Some projects that use Kolla docker containers (TripleO) run heat 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.

Change-Id: I4d648c4ce4f5f6ba311bfbbf9c78e06104163c61
Partially-Implements: blueprint apache-packages-for-apis
---
 docker/heat/heat-base/Dockerfile.j2 | 30 +++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/docker/heat/heat-base/Dockerfile.j2 b/docker/heat/heat-base/Dockerfile.j2
index b22290e38e..5e7e76a1c8 100644
--- a/docker/heat/heat-base/Dockerfile.j2
+++ b/docker/heat/heat-base/Dockerfile.j2
@@ -10,14 +10,40 @@ MAINTAINER {{ maintainer }}
 {% if install_type == 'binary' %}
 
 {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
-    {% set heat_base_packages = ['openstack-heat-common'] %}
+    {% set heat_base_packages = [
+        'openstack-heat-common',
+        'httpd',
+        'mod_wsgi'
+    ] %}
 {% elif base_distro in ['ubuntu'] %}
-    {% set heat_base_packages = ['heat-common'] %}
+    {% set heat_base_packages = [
+        'heat-common',
+        'apache2',
+        'libapache2-mod-wsgi',
+    ] %}
 {% endif %}
 {{ macros.install_packages(heat_base_packages | customizable("packages")) }}
 
 {% elif install_type == 'source' %}
 
+{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+
+    {% set heat_base_packages = [
+        'httpd',
+        'mod_wsgi'
+    ] %}
+
+{% elif base_distro in ['ubuntu'] %}
+
+    {% set heat_base_packages = [
+        'apache2',
+        'libapache2-mod-wsgi'
+    ] %}
+
+{% endif %}
+
+{{ macros.install_packages(heat_base_packages | customizable("packages")) }}
+
 ADD heat-base-archive /heat-base-source
 
 {% set heat_base_pip_packages = [