diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-03-15 11:47:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-03-15 11:47:51 +0000 |
| commit | a0c77ad6d0a32f629fc2e55d094c19742be72e24 (patch) | |
| tree | 37a06e6dfae9e45ffc849ac9af753031587ead52 | |
| parent | 85ca88882ea28f8c18c54dc2979aaa4f79549a5b (diff) | |
| parent | 76ab2b84f464ebe619bc5abc30d083187763642e (diff) | |
| download | kolla-a0c77ad6d0a32f629fc2e55d094c19742be72e24.tar.gz kolla-a0c77ad6d0a32f629fc2e55d094c19742be72e24.zip | |
Merge "Add Apache packages to heat containers"
| -rw-r--r-- | docker/heat/heat-base/Dockerfile.j2 | 30 |
1 files changed, 28 insertions, 2 deletions
diff --git a/docker/heat/heat-base/Dockerfile.j2 b/docker/heat/heat-base/Dockerfile.j2 index b22290e38..5e7e76a1c 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 = [ |