diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-09 17:18:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-09 17:18:35 +0000 |
| commit | 533d28c66f73ffaeec6a3876b0590d876913005c (patch) | |
| tree | 90a0f919b76725f8e5c60b89fc060090f39f8440 /docker/centos/binary | |
| parent | 41051e7009045379f2a38773b74e7da2f7459351 (diff) | |
| parent | ba01f942068f2c38d446f9ec52b22bf93ed7aeb2 (diff) | |
| download | kolla-533d28c66f73ffaeec6a3876b0590d876913005c.tar.gz kolla-533d28c66f73ffaeec6a3876b0590d876913005c.zip | |
Merge "Remove config-internal from designate"
Diffstat (limited to 'docker/centos/binary')
14 files changed, 6 insertions, 15 deletions
diff --git a/docker/centos/binary/designate/designate-api/Dockerfile b/docker/centos/binary/designate/designate-api/Dockerfile index 926d88e9a..34011aca2 100644 --- a/docker/centos/binary/designate/designate-api/Dockerfile +++ b/docker/centos/binary/designate/designate-api/Dockerfile @@ -6,6 +6,6 @@ RUN yum install -y \ && yum clean all 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/binary/designate/designate-api/config-internal.sh b/docker/centos/binary/designate/designate-api/config-internal.sh deleted file mode 120000 index 438a6fd75..000000000 --- a/docker/centos/binary/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/binary/designate/designate-backend-bind9/Dockerfile b/docker/centos/binary/designate/designate-backend-bind9/Dockerfile index 0c9baca2a..172645f8c 100644 --- a/docker/centos/binary/designate/designate-backend-bind9/Dockerfile +++ b/docker/centos/binary/designate/designate-backend-bind9/Dockerfile @@ -6,6 +6,6 @@ RUN yum install -y bind \ && cp -pr /var/named /opt/kolla/var-named 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/binary/designate/designate-backend-bind9/config-internal.sh b/docker/centos/binary/designate/designate-backend-bind9/config-internal.sh deleted file mode 120000 index 7d7c0d0e4..000000000 --- a/docker/centos/binary/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/binary/designate/designate-base/Dockerfile b/docker/centos/binary/designate/designate-base/Dockerfile index 35bf76467..1b4ebe9ec 100644 --- a/docker/centos/binary/designate/designate-base/Dockerfile +++ b/docker/centos/binary/designate/designate-base/Dockerfile @@ -14,5 +14,3 @@ RUN yum install -y \ && cp /etc/designate/policy.json /tmp/ \ && rpm -e openstack-designate-api \ && mv /tmp/policy.json /etc/designate/ - -COPY config-designate.sh /opt/kolla/config-designate.sh diff --git a/docker/centos/binary/designate/designate-base/config-designate.sh b/docker/centos/binary/designate/designate-base/config-designate.sh deleted file mode 120000 index 77aa738de..000000000 --- a/docker/centos/binary/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/binary/designate/designate-central/Dockerfile b/docker/centos/binary/designate/designate-central/Dockerfile index 4b7cca500..480f60513 100644 --- a/docker/centos/binary/designate/designate-central/Dockerfile +++ b/docker/centos/binary/designate/designate-central/Dockerfile @@ -6,6 +6,6 @@ RUN yum install -y \ && yum clean all 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/binary/designate/designate-central/config-internal.sh b/docker/centos/binary/designate/designate-central/config-internal.sh deleted file mode 120000 index 94fcafd40..000000000 --- a/docker/centos/binary/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/binary/designate/designate-mdns/Dockerfile b/docker/centos/binary/designate/designate-mdns/Dockerfile index 3aa77d14f..befdc14e6 100644 --- a/docker/centos/binary/designate/designate-mdns/Dockerfile +++ b/docker/centos/binary/designate/designate-mdns/Dockerfile @@ -5,6 +5,6 @@ RUN yum install -y openstack-designate-mdns \ && yum clean all 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/binary/designate/designate-mdns/config-internal.sh b/docker/centos/binary/designate/designate-mdns/config-internal.sh deleted file mode 120000 index c838250c9..000000000 --- a/docker/centos/binary/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/binary/designate/designate-poolmanager/Dockerfile b/docker/centos/binary/designate/designate-poolmanager/Dockerfile index a69a3acac..2a1851060 100644 --- a/docker/centos/binary/designate/designate-poolmanager/Dockerfile +++ b/docker/centos/binary/designate/designate-poolmanager/Dockerfile @@ -8,6 +8,6 @@ RUN yum install -y \ && yum clean all 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/binary/designate/designate-poolmanager/config-internal.sh b/docker/centos/binary/designate/designate-poolmanager/config-internal.sh deleted file mode 120000 index 6b43b0ddd..000000000 --- a/docker/centos/binary/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/binary/designate/designate-sink/Dockerfile b/docker/centos/binary/designate/designate-sink/Dockerfile index dffb6384a..e2f3b6026 100644 --- a/docker/centos/binary/designate/designate-sink/Dockerfile +++ b/docker/centos/binary/designate/designate-sink/Dockerfile @@ -7,6 +7,6 @@ RUN yum install -y \ && yum clean all 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/binary/designate/designate-sink/config-internal.sh b/docker/centos/binary/designate/designate-sink/config-internal.sh deleted file mode 120000 index 713fc1b22..000000000 --- a/docker/centos/binary/designate/designate-sink/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/designate/designate-sink/config-internal.sh
\ No newline at end of file |