diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-02-16 23:09:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-02-16 23:09:31 +0000 |
| commit | eaec95b14e21ad51f32097f00b10f3092dff4e09 (patch) | |
| tree | 4b4cfd15686fb919df1a39d9225d6096d9a9ef9c | |
| parent | 16f2c199f1fc945ec0f83520efa865d4189ce223 (diff) | |
| parent | 9a64a8c027564462aa5e403a56b1eb24240d0288 (diff) | |
| download | kolla-eaec95b14e21ad51f32097f00b10f3092dff4e09.tar.gz kolla-eaec95b14e21ad51f32097f00b10f3092dff4e09.zip | |
Merge "Add heat-all container"
| -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", |