diff options
| author | Dan Prince <dprince@redhat.com> | 2017-02-13 17:05:59 -0500 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2017-02-15 12:02:38 -0500 |
| commit | 9a64a8c027564462aa5e403a56b1eb24240d0288 (patch) | |
| tree | 72504d335bc3da7aa5fb22ac79a90329f6e3c357 | |
| parent | 2a03b895d5c208cdd327de8f2789e3e168c441a5 (diff) | |
| download | kolla-9a64a8c027564462aa5e403a56b1eb24240d0288.tar.gz kolla-9a64a8c027564462aa5e403a56b1eb24240d0288.zip | |
Add heat-all container
TripleO makes use of a heat-all container for undercloud
installation. This container includes the API, Engine, and
a new heat-all launcher (included in the monolith package).
Implements: blueprint heat-all
Change-Id: If1cc3e959b63f775e15e6eeef4b54981fb3793e9
| -rw-r--r-- | docker/heat/heat-all/Dockerfile.j2 | 24 | ||||
| -rw-r--r-- | tests/test_build.py | 1 |
2 files changed, 25 insertions, 0 deletions
diff --git a/docker/heat/heat-all/Dockerfile.j2 b/docker/heat/heat-all/Dockerfile.j2 new file mode 100644 index 000000000..ea7f6d8d5 --- /dev/null +++ b/docker/heat/heat-all/Dockerfile.j2 @@ -0,0 +1,24 @@ +FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }} +MAINTAINER {{ maintainer }} + +{% block heat_all_header %}{% endblock %} + +{% import "macros.j2" as macros with context %} + +{% if install_type == 'binary' %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + {% set heat_all_packages = [ + 'openstack-heat-api', + 'openstack-heat-monolith', + 'openstack-heat-engine' + ] %} + {% elif base_distro in ['ubuntu'] %} +RUN echo 'heat-all not yet available for {{ base_distro }}' && /bin/false + {% endif %} +{{ macros.install_packages(heat_all_packages | customizable("packages")) }} + +{% endif %} +{% block heat_all_footer %}{% endblock %} +{% block footer %}{% endblock %} + +USER heat diff --git a/tests/test_build.py b/tests/test_build.py index de2199b62..491637e5b 100644 --- a/tests/test_build.py +++ b/tests/test_build.py @@ -108,6 +108,7 @@ class BuildTestUbuntuBinary(BuildTest, base.BaseTestCase): "cloudkitty-base", "congress-base", "freezer-base", + "heat-all", "karbor-base", "kuryr-base", "monasca-base", |