From ba01f942068f2c38d446f9ec52b22bf93ed7aeb2 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Fri, 7 Aug 2015 09:10:15 -0700 Subject: Remove config-internal from designate Change-Id: I15a9c34a08055c6f9ad53f211a8c1a62de3f58ff Partially-Implements: blueprint remove-config-internal --- docker/centos/source/designate/designate-api/Dockerfile | 2 +- docker/centos/source/designate/designate-api/config-internal.sh | 1 - docker/centos/source/designate/designate-backend-bind9/Dockerfile | 2 +- .../centos/source/designate/designate-backend-bind9/config-internal.sh | 1 - docker/centos/source/designate/designate-base/Dockerfile | 2 -- docker/centos/source/designate/designate-base/config-designate.sh | 1 - docker/centos/source/designate/designate-central/Dockerfile | 2 +- docker/centos/source/designate/designate-central/config-internal.sh | 1 - docker/centos/source/designate/designate-mdns/Dockerfile | 2 +- docker/centos/source/designate/designate-mdns/config-internal.sh | 1 - docker/centos/source/designate/designate-poolmanager/Dockerfile | 2 +- docker/centos/source/designate/designate-poolmanager/config-internal.sh | 1 - docker/centos/source/designate/designate-sink/Dockerfile | 2 +- docker/centos/source/designate/designate-sink/config-internal.sh | 1 - 14 files changed, 6 insertions(+), 15 deletions(-) delete mode 120000 docker/centos/source/designate/designate-api/config-internal.sh delete mode 120000 docker/centos/source/designate/designate-backend-bind9/config-internal.sh delete mode 120000 docker/centos/source/designate/designate-base/config-designate.sh delete mode 120000 docker/centos/source/designate/designate-central/config-internal.sh delete mode 120000 docker/centos/source/designate/designate-mdns/config-internal.sh delete mode 120000 docker/centos/source/designate/designate-poolmanager/config-internal.sh delete mode 120000 docker/centos/source/designate/designate-sink/config-internal.sh (limited to 'docker/centos/source') diff --git a/docker/centos/source/designate/designate-api/Dockerfile b/docker/centos/source/designate/designate-api/Dockerfile index ab724493f..eac73ff52 100644 --- a/docker/centos/source/designate/designate-api/Dockerfile +++ b/docker/centos/source/designate/designate-api/Dockerfile @@ -2,6 +2,6 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%designate-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY start.sh /start.sh -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/source/designate/designate-api/config-internal.sh b/docker/centos/source/designate/designate-api/config-internal.sh deleted file mode 120000 index 438a6fd75..000000000 --- a/docker/centos/source/designate/designate-api/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/designate/designate-api/config-internal.sh \ No newline at end of file diff --git a/docker/centos/source/designate/designate-backend-bind9/Dockerfile b/docker/centos/source/designate/designate-backend-bind9/Dockerfile index ab724493f..eac73ff52 100644 --- a/docker/centos/source/designate/designate-backend-bind9/Dockerfile +++ b/docker/centos/source/designate/designate-backend-bind9/Dockerfile @@ -2,6 +2,6 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%designate-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY start.sh /start.sh -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/source/designate/designate-backend-bind9/config-internal.sh b/docker/centos/source/designate/designate-backend-bind9/config-internal.sh deleted file mode 120000 index 7d7c0d0e4..000000000 --- a/docker/centos/source/designate/designate-backend-bind9/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/designate/designate-backend-bind9/config-internal.sh \ No newline at end of file diff --git a/docker/centos/source/designate/designate-base/Dockerfile b/docker/centos/source/designate/designate-base/Dockerfile index 97c1ef941..92f04c37f 100644 --- a/docker/centos/source/designate/designate-base/Dockerfile +++ b/docker/centos/source/designate/designate-base/Dockerfile @@ -12,6 +12,4 @@ RUN cd /designate \ && cp -r /designate/etc/* /etc/designate/ \ && rm -rf /root/.cache -COPY config-designate.sh /opt/kolla/ - CMD ["/start.sh"] diff --git a/docker/centos/source/designate/designate-base/config-designate.sh b/docker/centos/source/designate/designate-base/config-designate.sh deleted file mode 120000 index 77aa738de..000000000 --- a/docker/centos/source/designate/designate-base/config-designate.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/designate/designate-base/config-designate.sh \ No newline at end of file diff --git a/docker/centos/source/designate/designate-central/Dockerfile b/docker/centos/source/designate/designate-central/Dockerfile index ab724493f..eac73ff52 100644 --- a/docker/centos/source/designate/designate-central/Dockerfile +++ b/docker/centos/source/designate/designate-central/Dockerfile @@ -2,6 +2,6 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%designate-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY start.sh /start.sh -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/source/designate/designate-central/config-internal.sh b/docker/centos/source/designate/designate-central/config-internal.sh deleted file mode 120000 index 94fcafd40..000000000 --- a/docker/centos/source/designate/designate-central/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/designate/designate-central/config-internal.sh \ No newline at end of file diff --git a/docker/centos/source/designate/designate-mdns/Dockerfile b/docker/centos/source/designate/designate-mdns/Dockerfile index ab724493f..eac73ff52 100644 --- a/docker/centos/source/designate/designate-mdns/Dockerfile +++ b/docker/centos/source/designate/designate-mdns/Dockerfile @@ -2,6 +2,6 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%designate-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY start.sh /start.sh -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/source/designate/designate-mdns/config-internal.sh b/docker/centos/source/designate/designate-mdns/config-internal.sh deleted file mode 120000 index c838250c9..000000000 --- a/docker/centos/source/designate/designate-mdns/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/designate/designate-mdns/config-internal.sh \ No newline at end of file diff --git a/docker/centos/source/designate/designate-poolmanager/Dockerfile b/docker/centos/source/designate/designate-poolmanager/Dockerfile index ab724493f..eac73ff52 100644 --- a/docker/centos/source/designate/designate-poolmanager/Dockerfile +++ b/docker/centos/source/designate/designate-poolmanager/Dockerfile @@ -2,6 +2,6 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%designate-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY start.sh /start.sh -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/source/designate/designate-poolmanager/config-internal.sh b/docker/centos/source/designate/designate-poolmanager/config-internal.sh deleted file mode 120000 index 6b43b0ddd..000000000 --- a/docker/centos/source/designate/designate-poolmanager/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/designate/designate-poolmanager/config-internal.sh \ No newline at end of file diff --git a/docker/centos/source/designate/designate-sink/Dockerfile b/docker/centos/source/designate/designate-sink/Dockerfile index ab724493f..eac73ff52 100644 --- a/docker/centos/source/designate/designate-sink/Dockerfile +++ b/docker/centos/source/designate/designate-sink/Dockerfile @@ -2,6 +2,6 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%designate-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY start.sh /start.sh -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/source/designate/designate-sink/config-internal.sh b/docker/centos/source/designate/designate-sink/config-internal.sh deleted file mode 120000 index 713fc1b22..000000000 --- a/docker/centos/source/designate/designate-sink/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/designate/designate-sink/config-internal.sh \ No newline at end of file -- cgit v1.2.3