aboutsummaryrefslogtreecommitdiff
path: root/docker/centos/binary/heat
diff options
context:
space:
mode:
authorSteven Dake <stdake@cisco.com>2015-08-27 19:23:49 -0700
committerSteven Dake <stdake@cisco.com>2015-08-28 00:50:30 -0700
commitf895ee07cc5c1030e32854cf9a4e91bbeaf4de12 (patch)
treecc7d17c2c63bf83f6a983553b8729f67abeac58d /docker/centos/binary/heat
parent5c82e0c90ce0fedf523b11b0b933f2276edf8f46 (diff)
downloadkolla-f895ee07cc5c1030e32854cf9a4e91bbeaf4de12.tar.gz
kolla-f895ee07cc5c1030e32854cf9a4e91bbeaf4de12.zip
Remove docker directory
Remove the docker directory (yay) and old build tools. This will result in an f21 failing gate - however, I have a patch submission to remove that gate from our project configuration. Change-Id: I3c461cedb6906422c8076f60c470e773d6cdcf33 Partially-Implements: blueprint remove-docker-dir
Diffstat (limited to 'docker/centos/binary/heat')
-rw-r--r--docker/centos/binary/heat/heat-api-cfn/Dockerfile12
l---------docker/centos/binary/heat/heat-api-cfn/build1
l---------docker/centos/binary/heat/heat-api-cfn/config-external.sh1
l---------docker/centos/binary/heat/heat-api-cfn/start.sh1
-rw-r--r--docker/centos/binary/heat/heat-api/Dockerfile14
l---------docker/centos/binary/heat/heat-api/build1
l---------docker/centos/binary/heat/heat-api/config-external.sh1
l---------docker/centos/binary/heat/heat-api/start.sh1
-rw-r--r--docker/centos/binary/heat/heat-base/Dockerfile6
l---------docker/centos/binary/heat/heat-base/build1
-rw-r--r--docker/centos/binary/heat/heat-engine/Dockerfile15
l---------docker/centos/binary/heat/heat-engine/build1
l---------docker/centos/binary/heat/heat-engine/config-external.sh1
l---------docker/centos/binary/heat/heat-engine/start.sh1
14 files changed, 0 insertions, 57 deletions
diff --git a/docker/centos/binary/heat/heat-api-cfn/Dockerfile b/docker/centos/binary/heat/heat-api-cfn/Dockerfile
deleted file mode 100644
index bfd2fe0bc..000000000
--- a/docker/centos/binary/heat/heat-api-cfn/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install \
- openstack-heat-api-cfn \
- python-openstackclient \
- && yum clean all
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/heat/heat-api-cfn/build b/docker/centos/binary/heat/heat-api-cfn/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/binary/heat/heat-api-cfn/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/centos/binary/heat/heat-api-cfn/config-external.sh b/docker/centos/binary/heat/heat-api-cfn/config-external.sh
deleted file mode 120000
index d1d084800..000000000
--- a/docker/centos/binary/heat/heat-api-cfn/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/heat/heat-api-cfn/config-external.sh \ No newline at end of file
diff --git a/docker/centos/binary/heat/heat-api-cfn/start.sh b/docker/centos/binary/heat/heat-api-cfn/start.sh
deleted file mode 120000
index a71201d4b..000000000
--- a/docker/centos/binary/heat/heat-api-cfn/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/heat/heat-api-cfn/start.sh \ No newline at end of file
diff --git a/docker/centos/binary/heat/heat-api/Dockerfile b/docker/centos/binary/heat/heat-api/Dockerfile
deleted file mode 100644
index 6f7718683..000000000
--- a/docker/centos/binary/heat/heat-api/Dockerfile
+++ /dev/null
@@ -1,14 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-# TODO: configure cfn and cloudwatch
-# TODO: remove python-openstackclient once crux feature is added in start.sh
-RUN yum -y install \
- openstack-heat-api \
- python-openstackclient \
- && yum clean all
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/heat/heat-api/build b/docker/centos/binary/heat/heat-api/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/binary/heat/heat-api/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/centos/binary/heat/heat-api/config-external.sh b/docker/centos/binary/heat/heat-api/config-external.sh
deleted file mode 120000
index bfc23ba35..000000000
--- a/docker/centos/binary/heat/heat-api/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/heat/heat-api/config-external.sh \ No newline at end of file
diff --git a/docker/centos/binary/heat/heat-api/start.sh b/docker/centos/binary/heat/heat-api/start.sh
deleted file mode 120000
index cf3eb022c..000000000
--- a/docker/centos/binary/heat/heat-api/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/heat/heat-api/start.sh \ No newline at end of file
diff --git a/docker/centos/binary/heat/heat-base/Dockerfile b/docker/centos/binary/heat/heat-base/Dockerfile
deleted file mode 100644
index f66e130e3..000000000
--- a/docker/centos/binary/heat/heat-base/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install \
- python-oslo-reports \
- && yum clean all
diff --git a/docker/centos/binary/heat/heat-base/build b/docker/centos/binary/heat/heat-base/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/binary/heat/heat-base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/centos/binary/heat/heat-engine/Dockerfile b/docker/centos/binary/heat/heat-engine/Dockerfile
deleted file mode 100644
index 37cf7fb2c..000000000
--- a/docker/centos/binary/heat/heat-engine/Dockerfile
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install \
- # until http://pkgs.fedoraproject.org/cgit/openstack-heat.git/tree/openstack-heat.spec#n248 \
- # is updated, the clients must remain here: \
- python-barbicanclient \
- python-zaqarclient \
- openstack-heat-engine \
- && yum clean all
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
diff --git a/docker/centos/binary/heat/heat-engine/build b/docker/centos/binary/heat/heat-engine/build
deleted file mode 120000
index ec1913803..000000000
--- a/docker/centos/binary/heat/heat-engine/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/centos/binary/heat/heat-engine/config-external.sh b/docker/centos/binary/heat/heat-engine/config-external.sh
deleted file mode 120000
index a620c9e5b..000000000
--- a/docker/centos/binary/heat/heat-engine/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/heat/heat-engine/config-external.sh \ No newline at end of file
diff --git a/docker/centos/binary/heat/heat-engine/start.sh b/docker/centos/binary/heat/heat-engine/start.sh
deleted file mode 120000
index d660bc5d1..000000000
--- a/docker/centos/binary/heat/heat-engine/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/heat/heat-engine/start.sh \ No newline at end of file