diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-09 17:15:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-09 17:15:56 +0000 |
| commit | 146e492a83a32138ad787092514bf22f3f3baa3b (patch) | |
| tree | 2ed092fda1c5cc02586213a98d727afd2e10a9af /docker/centos/binary | |
| parent | a1a3b55a06ac6effa94563b10b5adf5950392df2 (diff) | |
| parent | 51e20db747653b67340333fe823a20e6fd8d898c (diff) | |
| download | kolla-146e492a83a32138ad787092514bf22f3f3baa3b.tar.gz kolla-146e492a83a32138ad787092514bf22f3f3baa3b.zip | |
Merge "Remove config-internal for Heat"
Diffstat (limited to 'docker/centos/binary')
| -rw-r--r-- | docker/centos/binary/heat/heat-api-cfn/Dockerfile | 6 | ||||
| l--------- | docker/centos/binary/heat/heat-api-cfn/check.sh | 1 | ||||
| l--------- | docker/centos/binary/heat/heat-api-cfn/config-internal.sh | 1 | ||||
| -rw-r--r-- | docker/centos/binary/heat/heat-api/Dockerfile | 6 | ||||
| l--------- | docker/centos/binary/heat/heat-api/check.sh | 1 | ||||
| l--------- | docker/centos/binary/heat/heat-api/config-internal.sh | 1 | ||||
| -rw-r--r--[-rwxr-xr-x] | docker/centos/binary/heat/heat-base/Dockerfile | 2 | ||||
| l--------- | docker/centos/binary/heat/heat-base/config-heat.sh | 1 | ||||
| -rw-r--r-- | docker/centos/binary/heat/heat-engine/Dockerfile | 5 | ||||
| l--------- | docker/centos/binary/heat/heat-engine/config-internal.sh | 1 |
10 files changed, 6 insertions, 19 deletions
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 index 8fa08858e..f66e130e3 100755..100644 --- 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 |