openstack/kolla
Code Issues Proposed changes

Add Apache packages to heat containers

Browse Source 
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
This commit is contained in:
Martin André 2017-03-14 17:15:27 +01:00
parent ae40ec099f
commit 76ab2b84f4
1 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
docker/heat/heat-base/Dockerfile.j2
View File

@ -10,14 +10,40 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% 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'] %} {% elif base_distro in ['ubuntu'] %}
{% set heat_base_packages = ['heat-common'] %} {% set heat_base_packages = [
'heat-common',
'apache2',
'libapache2-mod-wsgi',
] %}
{% endif %} {% endif %}
{{ macros.install_packages(heat_base_packages | customizable("packages")) }} {{ macros.install_packages(heat_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %} {% 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 ADD heat-base-archive /heat-base-source
{% set heat_base_pip_packages = [ {% set heat_base_pip_packages = [