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
This commit is contained in:
Dan Prince 2017-01-09 16:58:07 -05:00
parent bff91aecd9
commit 10c26d90e9

View File

@ -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 %}