diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-07-08 17:52:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-07-08 17:52:26 +0000 |
| commit | d27d2ebede1793b69ad9ad0f59ce9a3b402ffb89 (patch) | |
| tree | 15ee6f5c5501ef5e2b326ffd96be92efb499873a /docker/centos/binary | |
| parent | 7f6b2fa641340386b7ca930e892325519770c779 (diff) | |
| parent | 1b4d6b37b3174272eb530a3214f83dec66d93119 (diff) | |
| download | kolla-d27d2ebede1793b69ad9ad0f59ce9a3b402ffb89.tar.gz kolla-d27d2ebede1793b69ad9ad0f59ce9a3b402ffb89.zip | |
Merge "Add config-internal/config-external to Designate containers"
Diffstat (limited to 'docker/centos/binary')
18 files changed, 18 insertions, 0 deletions
diff --git a/docker/centos/binary/designate/designate-api/Dockerfile b/docker/centos/binary/designate/designate-api/Dockerfile index b68da474f..926d88e9a 100644 --- a/docker/centos/binary/designate/designate-api/Dockerfile +++ b/docker/centos/binary/designate/designate-api/Dockerfile @@ -6,5 +6,6 @@ RUN yum install -y \ && yum clean all COPY start.sh /start.sh +COPY config-internal.sh config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/binary/designate/designate-api/config-external.sh b/docker/centos/binary/designate/designate-api/config-external.sh new file mode 120000 index 000000000..da641a600 --- /dev/null +++ b/docker/centos/binary/designate/designate-api/config-external.sh @@ -0,0 +1 @@ +../../../../common/designate/designate-api/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/designate/designate-api/config-internal.sh b/docker/centos/binary/designate/designate-api/config-internal.sh new file mode 120000 index 000000000..438a6fd75 --- /dev/null +++ b/docker/centos/binary/designate/designate-api/config-internal.sh @@ -0,0 +1 @@ +../../../../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 7f57786c4..0c9baca2a 100644 --- a/docker/centos/binary/designate/designate-backend-bind9/Dockerfile +++ b/docker/centos/binary/designate/designate-backend-bind9/Dockerfile @@ -6,5 +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/ CMD ["/start.sh"] diff --git a/docker/centos/binary/designate/designate-backend-bind9/config-external.sh b/docker/centos/binary/designate/designate-backend-bind9/config-external.sh new file mode 120000 index 000000000..98eabc775 --- /dev/null +++ b/docker/centos/binary/designate/designate-backend-bind9/config-external.sh @@ -0,0 +1 @@ +../../../../common/designate/designate-backend-bind9/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/designate/designate-backend-bind9/config-internal.sh b/docker/centos/binary/designate/designate-backend-bind9/config-internal.sh new file mode 120000 index 000000000..7d7c0d0e4 --- /dev/null +++ b/docker/centos/binary/designate/designate-backend-bind9/config-internal.sh @@ -0,0 +1 @@ +../../../../common/designate/designate-backend-bind9/config-internal.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 59e0a0e32..4b7cca500 100644 --- a/docker/centos/binary/designate/designate-central/Dockerfile +++ b/docker/centos/binary/designate/designate-central/Dockerfile @@ -6,5 +6,6 @@ RUN yum install -y \ && yum clean all COPY start.sh /start.sh +COPY config-internal.sh config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/binary/designate/designate-central/config-external.sh b/docker/centos/binary/designate/designate-central/config-external.sh new file mode 120000 index 000000000..abe5bcd39 --- /dev/null +++ b/docker/centos/binary/designate/designate-central/config-external.sh @@ -0,0 +1 @@ +../../../../common/designate/designate-central/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/designate/designate-central/config-internal.sh b/docker/centos/binary/designate/designate-central/config-internal.sh new file mode 120000 index 000000000..94fcafd40 --- /dev/null +++ b/docker/centos/binary/designate/designate-central/config-internal.sh @@ -0,0 +1 @@ +../../../../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 87f4fdfc8..3aa77d14f 100644 --- a/docker/centos/binary/designate/designate-mdns/Dockerfile +++ b/docker/centos/binary/designate/designate-mdns/Dockerfile @@ -5,5 +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/ CMD ["/start.sh"] diff --git a/docker/centos/binary/designate/designate-mdns/config-external.sh b/docker/centos/binary/designate/designate-mdns/config-external.sh new file mode 120000 index 000000000..e450238fc --- /dev/null +++ b/docker/centos/binary/designate/designate-mdns/config-external.sh @@ -0,0 +1 @@ +../../../../common/designate/designate-mdns/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/designate/designate-mdns/config-internal.sh b/docker/centos/binary/designate/designate-mdns/config-internal.sh new file mode 120000 index 000000000..c838250c9 --- /dev/null +++ b/docker/centos/binary/designate/designate-mdns/config-internal.sh @@ -0,0 +1 @@ +../../../../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 25581d3db..a69a3acac 100644 --- a/docker/centos/binary/designate/designate-poolmanager/Dockerfile +++ b/docker/centos/binary/designate/designate-poolmanager/Dockerfile @@ -8,5 +8,6 @@ RUN yum install -y \ && yum clean all COPY start.sh /start.sh +COPY config-internal.sh config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/binary/designate/designate-poolmanager/config-external.sh b/docker/centos/binary/designate/designate-poolmanager/config-external.sh new file mode 120000 index 000000000..461acb12a --- /dev/null +++ b/docker/centos/binary/designate/designate-poolmanager/config-external.sh @@ -0,0 +1 @@ +../../../../common/designate/designate-poolmanager/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/designate/designate-poolmanager/config-internal.sh b/docker/centos/binary/designate/designate-poolmanager/config-internal.sh new file mode 120000 index 000000000..6b43b0ddd --- /dev/null +++ b/docker/centos/binary/designate/designate-poolmanager/config-internal.sh @@ -0,0 +1 @@ +../../../../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 5c7f58fb9..dffb6384a 100644 --- a/docker/centos/binary/designate/designate-sink/Dockerfile +++ b/docker/centos/binary/designate/designate-sink/Dockerfile @@ -7,5 +7,6 @@ RUN yum install -y \ && yum clean all COPY start.sh /start.sh +COPY config-internal.sh config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/binary/designate/designate-sink/config-external.sh b/docker/centos/binary/designate/designate-sink/config-external.sh new file mode 120000 index 000000000..edc94e6e4 --- /dev/null +++ b/docker/centos/binary/designate/designate-sink/config-external.sh @@ -0,0 +1 @@ +../../../../common/designate/designate-sink/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/designate/designate-sink/config-internal.sh b/docker/centos/binary/designate/designate-sink/config-internal.sh new file mode 120000 index 000000000..713fc1b22 --- /dev/null +++ b/docker/centos/binary/designate/designate-sink/config-internal.sh @@ -0,0 +1 @@ +../../../../common/designate/designate-sink/config-internal.sh
\ No newline at end of file |
