summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtur Zarzycki <azarzycki@mirantis.com>2015-12-28 17:39:33 +0100
committerArtur Zarzycki <azarzycki@mirantis.com>2015-12-30 00:21:48 +0100
commitac3d7c492eb74edebdb2b4ebde81ccb97563491c (patch)
treef875936410eb0506290f9d7e74fc24da70414aaf
parentc5c5c6e444287323a13c0558ac673ce21d9e3bb2 (diff)
downloadkolla-ac3d7c492eb74edebdb2b4ebde81ccb97563491c.tar.gz
kolla-ac3d7c492eb74edebdb2b4ebde81ccb97563491c.zip
Heat ubuntu binary container
Change-Id: Iae54825c48da6b22bc83331918f5734f9821ea03 Partially-Implements: blueprint binary-ubuntu
-rw-r--r--docker/heat/heat-api-cfn/Dockerfile.j26
-rw-r--r--docker/heat/heat-api/Dockerfile.j26
-rw-r--r--docker/heat/heat-base/Dockerfile.j26
-rw-r--r--docker/heat/heat-engine/Dockerfile.j26
4 files changed, 24 insertions, 0 deletions
diff --git a/docker/heat/heat-api-cfn/Dockerfile.j2 b/docker/heat/heat-api-cfn/Dockerfile.j2
index 0f257a168..68d8f80cf 100644
--- a/docker/heat/heat-api-cfn/Dockerfile.j2
+++ b/docker/heat/heat-api-cfn/Dockerfile.j2
@@ -7,6 +7,12 @@ MAINTAINER {{ maintainer }}
RUN yum -y install openstack-heat-api-cfn \
&& yum clean all
+ {% elif base_distro in ['ubuntu'] %}
+
+RUN apt-get install -y --no-install-recommends \
+ heat-api-cfn \
+ && apt-get clean
+
{% endif %}
{% endif %}
diff --git a/docker/heat/heat-api/Dockerfile.j2 b/docker/heat/heat-api/Dockerfile.j2
index 08fa9c7f8..358f44fdd 100644
--- a/docker/heat/heat-api/Dockerfile.j2
+++ b/docker/heat/heat-api/Dockerfile.j2
@@ -7,6 +7,12 @@ MAINTAINER {{ maintainer }}
RUN yum -y install openstack-heat-api \
&& yum clean all
+ {% elif base_distro in ['ubuntu'] %}
+
+RUN apt-get install -y --no-install-recommends \
+ heat-api \
+ && apt-get clean
+
{% endif %}
{% endif %}
diff --git a/docker/heat/heat-base/Dockerfile.j2 b/docker/heat/heat-base/Dockerfile.j2
index 7bdfb1483..8897cce84 100644
--- a/docker/heat/heat-base/Dockerfile.j2
+++ b/docker/heat/heat-base/Dockerfile.j2
@@ -8,6 +8,12 @@ RUN yum -y install \
openstack-heat-common \
&& yum clean all
+ {% elif base_distro in ['ubuntu'] %}
+
+RUN apt-get install -y --no-install-recommends \
+ heat-common \
+ && apt-get clean
+
{% endif %}
{% elif install_type == 'source' %}
diff --git a/docker/heat/heat-engine/Dockerfile.j2 b/docker/heat/heat-engine/Dockerfile.j2
index 7844eb565..9ec1167c9 100644
--- a/docker/heat/heat-engine/Dockerfile.j2
+++ b/docker/heat/heat-engine/Dockerfile.j2
@@ -12,6 +12,12 @@ RUN yum -y install \
openstack-heat-engine \
&& yum clean all
+ {% elif base_distro in ['ubuntu'] %}
+
+RUN apt-get install -y --no-install-recommends \
+ heat-engine \
+ && apt-get clean
+
{% endif %}
{% endif %}