aboutsummaryrefslogtreecommitdiff
path: root/docker/heat/heat-api
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-07-22 22:26:25 +0000
committerGerrit Code Review <review@openstack.org>2016-07-22 22:26:25 +0000
commitdb4e2875b3e59a4814b7574a294f1a51baac4855 (patch)
tree8f5f958d3fd094db1abcf7f6396f19025af3c2a0 /docker/heat/heat-api
parent753adbb22d0ad0e8652aeeb4d4599ab7ff03eea1 (diff)
parente5788a06e4efab9988be80a4a53df45c2e99318f (diff)
downloadkolla-db4e2875b3e59a4814b7574a294f1a51baac4855.tar.gz
kolla-db4e2875b3e59a4814b7574a294f1a51baac4855.zip
Merge "Customizations for heat"
Diffstat (limited to 'docker/heat/heat-api')
-rw-r--r--docker/heat/heat-api/Dockerfile.j216
1 files changed, 6 insertions, 10 deletions
diff --git a/docker/heat/heat-api/Dockerfile.j2 b/docker/heat/heat-api/Dockerfile.j2
index 990d8df51..22cae4177 100644
--- a/docker/heat/heat-api/Dockerfile.j2
+++ b/docker/heat/heat-api/Dockerfile.j2
@@ -1,25 +1,21 @@
FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }}
MAINTAINER {{ maintainer }}
+{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
-
-RUN yum -y install \
- openstack-heat-api \
- && yum clean all
-
+ {% set heat_api_packages = ['openstack-heat-api'] %}
{% elif base_distro in ['ubuntu'] %}
-
-RUN apt-get -y install --no-install-recommends \
- heat-api \
- && apt-get clean
-
+ {% set heat_api_packages = ['heat-api'] %}
{% endif %}
+RUN {{ macros.install_packages(heat_api_packages | customizable("packages")) }}
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_heat_extend_start
RUN chmod 755 /usr/local/bin/kolla_heat_extend_start
+{% block heat_api_footer %}{% endblock %}
+{% block footer %}{% endblock %}
{{ include_footer }}
USER heat