diff options
| author | Sam Yaple <sam@yaple.net> | 2015-08-07 18:53:38 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-08-07 18:53:38 +0000 |
| commit | 51e20db747653b67340333fe823a20e6fd8d898c (patch) | |
| tree | 793760ddb8cbdd254b50a8f19c4b91c435fb67cc /docker/centos/source | |
| parent | a5e907a8e91bc4e1d8f563dc79db0ee96c15d380 (diff) | |
| download | kolla-51e20db747653b67340333fe823a20e6fd8d898c.tar.gz kolla-51e20db747653b67340333fe823a20e6fd8d898c.zip | |
Remove config-internal for Heat
Change-Id: I33cf4afbb532c6268bdc2017211ea78733a42fd7
Partially-implements: blueprint remove-config-internal
Diffstat (limited to 'docker/centos/source')
| -rw-r--r-- | docker/centos/source/heat/heat-api-cfn/Dockerfile | 6 | ||||
| l--------- | docker/centos/source/heat/heat-api-cfn/check.sh | 1 | ||||
| l--------- | docker/centos/source/heat/heat-api-cfn/config-internal.sh | 1 | ||||
| -rw-r--r-- | docker/centos/source/heat/heat-api/Dockerfile | 6 | ||||
| l--------- | docker/centos/source/heat/heat-api/check.sh | 1 | ||||
| l--------- | docker/centos/source/heat/heat-api/config-internal.sh | 1 | ||||
| -rw-r--r--[-rwxr-xr-x] | docker/centos/source/heat/heat-base/Dockerfile | 4 | ||||
| l--------- | docker/centos/source/heat/heat-base/config-heat.sh | 1 | ||||
| -rw-r--r-- | docker/centos/source/heat/heat-engine/Dockerfile | 5 | ||||
| l--------- | docker/centos/source/heat/heat-engine/config-internal.sh | 1 |
10 files changed, 6 insertions, 21 deletions
diff --git a/docker/centos/source/heat/heat-api-cfn/Dockerfile b/docker/centos/source/heat/heat-api-cfn/Dockerfile index 30ffbeac8..fb0d48115 100644 --- a/docker/centos/source/heat/heat-api-cfn/Dockerfile +++ b/docker/centos/source/heat/heat-api-cfn/Dockerfile @@ -1,9 +1,7 @@ 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/ +COPY start.sh / +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/source/heat/heat-api-cfn/check.sh b/docker/centos/source/heat/heat-api-cfn/check.sh deleted file mode 120000 index 68fce28bf..000000000 --- a/docker/centos/source/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/source/heat/heat-api-cfn/config-internal.sh b/docker/centos/source/heat/heat-api-cfn/config-internal.sh deleted file mode 120000 index 280210245..000000000 --- a/docker/centos/source/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/source/heat/heat-api/Dockerfile b/docker/centos/source/heat/heat-api/Dockerfile index 30ffbeac8..fb0d48115 100644 --- a/docker/centos/source/heat/heat-api/Dockerfile +++ b/docker/centos/source/heat/heat-api/Dockerfile @@ -1,9 +1,7 @@ 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/ +COPY start.sh / +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/source/heat/heat-api/check.sh b/docker/centos/source/heat/heat-api/check.sh deleted file mode 120000 index 1e72d2e2c..000000000 --- a/docker/centos/source/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/source/heat/heat-api/config-internal.sh b/docker/centos/source/heat/heat-api/config-internal.sh deleted file mode 120000 index e13addbc9..000000000 --- a/docker/centos/source/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/source/heat/heat-base/Dockerfile b/docker/centos/source/heat/heat-base/Dockerfile index 52647a49e..4ef6f222c 100755..100644 --- a/docker/centos/source/heat/heat-base/Dockerfile +++ b/docker/centos/source/heat/heat-base/Dockerfile @@ -11,7 +11,3 @@ RUN cd /heat \ && mkdir /etc/heat /var/log/heat \ && cp -r /heat/etc/* /etc/heat/ \ && rm -rf /root/.cache - -COPY config-heat.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/source/heat/heat-base/config-heat.sh b/docker/centos/source/heat/heat-base/config-heat.sh deleted file mode 120000 index 8b4e89797..000000000 --- a/docker/centos/source/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/source/heat/heat-engine/Dockerfile b/docker/centos/source/heat/heat-engine/Dockerfile index 9af746142..fb0d48115 100644 --- a/docker/centos/source/heat/heat-engine/Dockerfile +++ b/docker/centos/source/heat/heat-engine/Dockerfile @@ -1,8 +1,7 @@ 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/ +COPY start.sh / +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/source/heat/heat-engine/config-internal.sh b/docker/centos/source/heat/heat-engine/config-internal.sh deleted file mode 120000 index b79835025..000000000 --- a/docker/centos/source/heat/heat-engine/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/heat/heat-engine/config-internal.sh
\ No newline at end of file |