From 51e20db747653b67340333fe823a20e6fd8d898c Mon Sep 17 00:00:00 2001 From: Sam Yaple Date: Fri, 7 Aug 2015 18:53:38 +0000 Subject: Remove config-internal for Heat Change-Id: I33cf4afbb532c6268bdc2017211ea78733a42fd7 Partially-implements: blueprint remove-config-internal --- docker/centos/binary/heat/heat-api-cfn/Dockerfile | 6 ++---- docker/centos/binary/heat/heat-api-cfn/check.sh | 1 - docker/centos/binary/heat/heat-api-cfn/config-internal.sh | 1 - docker/centos/binary/heat/heat-api/Dockerfile | 6 ++---- docker/centos/binary/heat/heat-api/check.sh | 1 - docker/centos/binary/heat/heat-api/config-internal.sh | 1 - docker/centos/binary/heat/heat-base/Dockerfile | 2 -- docker/centos/binary/heat/heat-base/config-heat.sh | 1 - docker/centos/binary/heat/heat-engine/Dockerfile | 5 ++--- docker/centos/binary/heat/heat-engine/config-internal.sh | 1 - 10 files changed, 6 insertions(+), 19 deletions(-) delete mode 120000 docker/centos/binary/heat/heat-api-cfn/check.sh delete mode 120000 docker/centos/binary/heat/heat-api-cfn/config-internal.sh delete mode 120000 docker/centos/binary/heat/heat-api/check.sh delete mode 120000 docker/centos/binary/heat/heat-api/config-internal.sh mode change 100755 => 100644 docker/centos/binary/heat/heat-base/Dockerfile delete mode 120000 docker/centos/binary/heat/heat-base/config-heat.sh delete mode 120000 docker/centos/binary/heat/heat-engine/config-internal.sh (limited to 'docker/centos/binary') diff --git a/docker/centos/binary/heat/heat-api-cfn/Dockerfile b/docker/centos/binary/heat/heat-api-cfn/Dockerfile index 450363bc0..bfd2fe0bc 100644 --- a/docker/centos/binary/heat/heat-api-cfn/Dockerfile +++ b/docker/centos/binary/heat/heat-api-cfn/Dockerfile @@ -6,9 +6,7 @@ RUN yum -y install \ python-openstackclient \ && yum clean all -COPY ./start.sh /start.sh -COPY ./check.sh /check.sh - -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY start.sh / +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/binary/heat/heat-api-cfn/check.sh b/docker/centos/binary/heat/heat-api-cfn/check.sh deleted file mode 120000 index 68fce28bf..000000000 --- a/docker/centos/binary/heat/heat-api-cfn/check.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/heat/heat-api-cfn/check.sh \ No newline at end of file diff --git a/docker/centos/binary/heat/heat-api-cfn/config-internal.sh b/docker/centos/binary/heat/heat-api-cfn/config-internal.sh deleted file mode 120000 index 280210245..000000000 --- a/docker/centos/binary/heat/heat-api-cfn/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/heat/heat-api-cfn/config-internal.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 index ac0e18772..6f7718683 100644 --- a/docker/centos/binary/heat/heat-api/Dockerfile +++ b/docker/centos/binary/heat/heat-api/Dockerfile @@ -8,9 +8,7 @@ RUN yum -y install \ python-openstackclient \ && yum clean all -COPY ./start.sh /start.sh -COPY ./check.sh /check.sh - -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY start.sh / +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/binary/heat/heat-api/check.sh b/docker/centos/binary/heat/heat-api/check.sh deleted file mode 120000 index 1e72d2e2c..000000000 --- a/docker/centos/binary/heat/heat-api/check.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/heat/heat-api/check.sh \ No newline at end of file diff --git a/docker/centos/binary/heat/heat-api/config-internal.sh b/docker/centos/binary/heat/heat-api/config-internal.sh deleted file mode 120000 index e13addbc9..000000000 --- a/docker/centos/binary/heat/heat-api/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/heat/heat-api/config-internal.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 old mode 100755 new mode 100644 index 8fa08858e..f66e130e3 --- a/docker/centos/binary/heat/heat-base/Dockerfile +++ b/docker/centos/binary/heat/heat-base/Dockerfile @@ -4,5 +4,3 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) RUN yum -y install \ python-oslo-reports \ && yum clean all - -COPY config-heat.sh /opt/kolla/ diff --git a/docker/centos/binary/heat/heat-base/config-heat.sh b/docker/centos/binary/heat/heat-base/config-heat.sh deleted file mode 120000 index 8b4e89797..000000000 --- a/docker/centos/binary/heat/heat-base/config-heat.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/heat/heat-base/config-heat.sh \ No newline at end of file diff --git a/docker/centos/binary/heat/heat-engine/Dockerfile b/docker/centos/binary/heat/heat-engine/Dockerfile index 83f2eba24..37cf7fb2c 100644 --- a/docker/centos/binary/heat/heat-engine/Dockerfile +++ b/docker/centos/binary/heat/heat-engine/Dockerfile @@ -9,8 +9,7 @@ RUN yum -y install \ openstack-heat-engine \ && yum clean all -COPY ./start.sh /start.sh - -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY start.sh / +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/binary/heat/heat-engine/config-internal.sh b/docker/centos/binary/heat/heat-engine/config-internal.sh deleted file mode 120000 index b79835025..000000000 --- a/docker/centos/binary/heat/heat-engine/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/heat/heat-engine/config-internal.sh \ No newline at end of file -- cgit v1.2.3