Merge "Add build from source for Heat"

22 files changed, 70 insertions, 0 deletions

diff --git a/docker/centos/source/base/Dockerfile b/docker/centos/source/base/Dockerfile
index b7792ff84..f12a28052 100644
--- a/docker/centos/source/base/Dockerfile
+++ b/docker/centos/source/base/Dockerfile
@@ -23,6 +23,8 @@ RUN yum install -y \
     python-devel \
     python-pip \
     tar \
+    libxml2-devel \
+    libxslt-devel \
   && yum clean all
 
 RUN pip install --upgrade pip
diff --git a/docker/centos/source/heat/heat-api-cfn/Dockerfile b/docker/centos/source/heat/heat-api-cfn/Dockerfile
new file mode 100644
index 000000000..30ffbeac8
--- /dev/null
+++ b/docker/centos/source/heat/heat-api-cfn/Dockerfile
@@ -0,0 +1,9 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+ADD ./start.sh /start.sh
+ADD ./check.sh /check.sh
+
+COPY config-internal.sh config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/heat/heat-api-cfn/build b/docker/centos/source/heat/heat-api-cfn/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/source/heat/heat-api-cfn/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/heat/heat-api-cfn/check.sh b/docker/centos/source/heat/heat-api-cfn/check.sh
new file mode 120000
index 000000000..68fce28bf
--- /dev/null
+++ b/docker/centos/source/heat/heat-api-cfn/check.sh
@@ -0,0 +1 @@
+../../../../common/heat/heat-api-cfn/check.sh
\ No newline at end of file
diff --git a/docker/centos/source/heat/heat-api-cfn/config-external.sh b/docker/centos/source/heat/heat-api-cfn/config-external.sh
new file mode 120000
index 000000000..d1d084800
--- /dev/null
+++ b/docker/centos/source/heat/heat-api-cfn/config-external.sh
@@ -0,0 +1 @@
+../../../../common/heat/heat-api-cfn/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/heat/heat-api-cfn/config-internal.sh b/docker/centos/source/heat/heat-api-cfn/config-internal.sh
new file mode 120000
index 000000000..280210245
--- /dev/null
+++ b/docker/centos/source/heat/heat-api-cfn/config-internal.sh
@@ -0,0 +1 @@
+../../../../common/heat/heat-api-cfn/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/heat/heat-api-cfn/start.sh b/docker/centos/source/heat/heat-api-cfn/start.sh
new file mode 120000
index 000000000..a71201d4b
--- /dev/null
+++ b/docker/centos/source/heat/heat-api-cfn/start.sh
@@ -0,0 +1 @@
+../../../../common/heat/heat-api-cfn/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/heat/heat-api/Dockerfile b/docker/centos/source/heat/heat-api/Dockerfile
new file mode 100644
index 000000000..30ffbeac8
--- /dev/null
+++ b/docker/centos/source/heat/heat-api/Dockerfile
@@ -0,0 +1,9 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+ADD ./start.sh /start.sh
+ADD ./check.sh /check.sh
+
+COPY config-internal.sh config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/heat/heat-api/build b/docker/centos/source/heat/heat-api/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/source/heat/heat-api/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/heat/heat-api/check.sh b/docker/centos/source/heat/heat-api/check.sh
new file mode 120000
index 000000000..1e72d2e2c
--- /dev/null
+++ b/docker/centos/source/heat/heat-api/check.sh
@@ -0,0 +1 @@
+../../../../common/heat/heat-api/check.sh
\ No newline at end of file
diff --git a/docker/centos/source/heat/heat-api/config-external.sh b/docker/centos/source/heat/heat-api/config-external.sh
new file mode 120000
index 000000000..bfc23ba35
--- /dev/null
+++ b/docker/centos/source/heat/heat-api/config-external.sh
@@ -0,0 +1 @@
+../../../../common/heat/heat-api/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/heat/heat-api/config-internal.sh b/docker/centos/source/heat/heat-api/config-internal.sh
new file mode 120000
index 000000000..e13addbc9
--- /dev/null
+++ b/docker/centos/source/heat/heat-api/config-internal.sh
@@ -0,0 +1 @@
+../../../../common/heat/heat-api/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/heat/heat-api/start.sh b/docker/centos/source/heat/heat-api/start.sh
new file mode 120000
index 000000000..cf3eb022c
--- /dev/null
+++ b/docker/centos/source/heat/heat-api/start.sh
@@ -0,0 +1 @@
+../../../../common/heat/heat-api/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/heat/heat-base/.buildinfo b/docker/centos/source/heat/heat-base/.buildinfo
new file mode 100644
index 000000000..72fd94593
--- /dev/null
+++ b/docker/centos/source/heat/heat-base/.buildinfo
@@ -0,0 +1,10 @@
+# Build info specific to this image. All values can be overridden in .buildconf
+
+COMPONENT=heat
+SOURCE_INSTALL_AVAILABLE=1
+
+# Used for git install method
+: ${CLONE_FROM:=https://github.com/openstack/heat}
+
+# Used for curl install method
+: ${TARBALL_URI:=http://tarballs.openstack.org/heat/heat-2015.1.0.tar.gz}
diff --git a/docker/centos/source/heat/heat-base/Dockerfile b/docker/centos/source/heat/heat-base/Dockerfile
new file mode 100755
index 000000000..3453d4901
--- /dev/null
+++ b/docker/centos/source/heat/heat-base/Dockerfile
@@ -0,0 +1,16 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+ADD ./heat.tar /
+RUN ln -s /heat-* /heat
+
+RUN cd /heat \
+    && useradd --user-group heat \
+    && pip install -r requirements.txt \
+    && pip install /heat \
+    && mkdir /etc/heat /var/log/heat \
+    && cp -r /heat/etc/* /etc/heat/
+
+COPY config-heat.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/heat/heat-base/build b/docker/centos/source/heat/heat-base/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/source/heat/heat-base/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/heat/heat-base/config-heat.sh b/docker/centos/source/heat/heat-base/config-heat.sh
new file mode 120000
index 000000000..8b4e89797
--- /dev/null
+++ b/docker/centos/source/heat/heat-base/config-heat.sh
@@ -0,0 +1 @@
+../../../../common/heat/heat-base/config-heat.sh
\ No newline at end of file
diff --git a/docker/centos/source/heat/heat-engine/Dockerfile b/docker/centos/source/heat/heat-engine/Dockerfile
new file mode 100644
index 000000000..9af746142
--- /dev/null
+++ b/docker/centos/source/heat/heat-engine/Dockerfile
@@ -0,0 +1,8 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+ADD ./start.sh /start.sh
+
+COPY config-internal.sh config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/heat/heat-engine/build b/docker/centos/source/heat/heat-engine/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/source/heat/heat-engine/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/heat/heat-engine/config-external.sh b/docker/centos/source/heat/heat-engine/config-external.sh
new file mode 120000
index 000000000..a620c9e5b
--- /dev/null
+++ b/docker/centos/source/heat/heat-engine/config-external.sh
@@ -0,0 +1 @@
+../../../../common/heat/heat-engine/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/heat/heat-engine/config-internal.sh b/docker/centos/source/heat/heat-engine/config-internal.sh
new file mode 120000
index 000000000..b79835025
--- /dev/null
+++ b/docker/centos/source/heat/heat-engine/config-internal.sh
@@ -0,0 +1 @@
+../../../../common/heat/heat-engine/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/heat/heat-engine/start.sh b/docker/centos/source/heat/heat-engine/start.sh
new file mode 120000
index 000000000..d660bc5d1
--- /dev/null
+++ b/docker/centos/source/heat/heat-engine/start.sh
@@ -0,0 +1 @@
+../../../../common/heat/heat-engine/start.sh
\ No newline at end of file