From 60b6c1d81e8735a50fcf776d5618d5b1dc82ff00 Mon Sep 17 00:00:00 2001 From: Harm Weites Date: Thu, 2 Jul 2015 23:37:16 +0200 Subject: Add config-internal/config-external to Swift containers These containers look to be broken, bad. Fixing them should be done through a separate bug. Here we only focus on getting aligned for Ansible deployments. Partially Implements: Blueprint standard-start Change-Id: I9d538f2c39510266f30cfed88e01c203f35bfb8e --- docker/centos/binary/swift/swift-account/Dockerfile | 4 +++- docker/centos/binary/swift/swift-account/config-external.sh | 1 + docker/centos/binary/swift/swift-account/config-internal.sh | 1 + docker/centos/binary/swift/swift-container/Dockerfile | 4 +++- docker/centos/binary/swift/swift-container/config-external.sh | 1 + docker/centos/binary/swift/swift-container/config-internal.sh | 1 + docker/centos/binary/swift/swift-object/Dockerfile | 4 +++- docker/centos/binary/swift/swift-object/config-external.sh | 1 + docker/centos/binary/swift/swift-object/config-internal.sh | 1 + docker/centos/binary/swift/swift-proxy-server/Dockerfile | 4 +++- docker/centos/binary/swift/swift-proxy-server/config-external.sh | 1 + docker/centos/binary/swift/swift-proxy-server/config-internal.sh | 1 + 12 files changed, 20 insertions(+), 4 deletions(-) create mode 120000 docker/centos/binary/swift/swift-account/config-external.sh create mode 120000 docker/centos/binary/swift/swift-account/config-internal.sh create mode 120000 docker/centos/binary/swift/swift-container/config-external.sh create mode 120000 docker/centos/binary/swift/swift-container/config-internal.sh create mode 120000 docker/centos/binary/swift/swift-object/config-external.sh create mode 120000 docker/centos/binary/swift/swift-object/config-internal.sh create mode 120000 docker/centos/binary/swift/swift-proxy-server/config-external.sh create mode 120000 docker/centos/binary/swift/swift-proxy-server/config-internal.sh (limited to 'docker/centos/binary') diff --git a/docker/centos/binary/swift/swift-account/Dockerfile b/docker/centos/binary/swift/swift-account/Dockerfile index 2c26802e3..6c8d1cc19 100644 --- a/docker/centos/binary/swift/swift-account/Dockerfile +++ b/docker/centos/binary/swift/swift-account/Dockerfile @@ -2,5 +2,7 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) ADD ./start.sh /start.sh -CMD ["/start.sh"] +COPY config-internal.sh config-external.sh /opt/kolla/ + +CMD ["/start.sh"] diff --git a/docker/centos/binary/swift/swift-account/config-external.sh b/docker/centos/binary/swift/swift-account/config-external.sh new file mode 120000 index 000000000..e7c6637fe --- /dev/null +++ b/docker/centos/binary/swift/swift-account/config-external.sh @@ -0,0 +1 @@ +../../../../common/swift/swift-account/config-external.sh \ No newline at end of file diff --git a/docker/centos/binary/swift/swift-account/config-internal.sh b/docker/centos/binary/swift/swift-account/config-internal.sh new file mode 120000 index 000000000..48504d07e --- /dev/null +++ b/docker/centos/binary/swift/swift-account/config-internal.sh @@ -0,0 +1 @@ +../../../../common/swift/swift-account/config-internal.sh \ No newline at end of file diff --git a/docker/centos/binary/swift/swift-container/Dockerfile b/docker/centos/binary/swift/swift-container/Dockerfile index 2c26802e3..6c8d1cc19 100644 --- a/docker/centos/binary/swift/swift-container/Dockerfile +++ b/docker/centos/binary/swift/swift-container/Dockerfile @@ -2,5 +2,7 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) ADD ./start.sh /start.sh -CMD ["/start.sh"] +COPY config-internal.sh config-external.sh /opt/kolla/ + +CMD ["/start.sh"] diff --git a/docker/centos/binary/swift/swift-container/config-external.sh b/docker/centos/binary/swift/swift-container/config-external.sh new file mode 120000 index 000000000..efc76b7af --- /dev/null +++ b/docker/centos/binary/swift/swift-container/config-external.sh @@ -0,0 +1 @@ +../../../../common/swift/swift-container/config-external.sh \ No newline at end of file diff --git a/docker/centos/binary/swift/swift-container/config-internal.sh b/docker/centos/binary/swift/swift-container/config-internal.sh new file mode 120000 index 000000000..789a210a3 --- /dev/null +++ b/docker/centos/binary/swift/swift-container/config-internal.sh @@ -0,0 +1 @@ +../../../../common/swift/swift-container/config-internal.sh \ No newline at end of file diff --git a/docker/centos/binary/swift/swift-object/Dockerfile b/docker/centos/binary/swift/swift-object/Dockerfile index 2c26802e3..6c8d1cc19 100644 --- a/docker/centos/binary/swift/swift-object/Dockerfile +++ b/docker/centos/binary/swift/swift-object/Dockerfile @@ -2,5 +2,7 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) ADD ./start.sh /start.sh -CMD ["/start.sh"] +COPY config-internal.sh config-external.sh /opt/kolla/ + +CMD ["/start.sh"] diff --git a/docker/centos/binary/swift/swift-object/config-external.sh b/docker/centos/binary/swift/swift-object/config-external.sh new file mode 120000 index 000000000..f4256fa63 --- /dev/null +++ b/docker/centos/binary/swift/swift-object/config-external.sh @@ -0,0 +1 @@ +../../../../common/swift/swift-object/config-external.sh \ No newline at end of file diff --git a/docker/centos/binary/swift/swift-object/config-internal.sh b/docker/centos/binary/swift/swift-object/config-internal.sh new file mode 120000 index 000000000..3f8ba1de9 --- /dev/null +++ b/docker/centos/binary/swift/swift-object/config-internal.sh @@ -0,0 +1 @@ +../../../../common/swift/swift-object/config-internal.sh \ No newline at end of file diff --git a/docker/centos/binary/swift/swift-proxy-server/Dockerfile b/docker/centos/binary/swift/swift-proxy-server/Dockerfile index 2c26802e3..6c8d1cc19 100644 --- a/docker/centos/binary/swift/swift-proxy-server/Dockerfile +++ b/docker/centos/binary/swift/swift-proxy-server/Dockerfile @@ -2,5 +2,7 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) ADD ./start.sh /start.sh -CMD ["/start.sh"] +COPY config-internal.sh config-external.sh /opt/kolla/ + +CMD ["/start.sh"] diff --git a/docker/centos/binary/swift/swift-proxy-server/config-external.sh b/docker/centos/binary/swift/swift-proxy-server/config-external.sh new file mode 120000 index 000000000..04e1c640f --- /dev/null +++ b/docker/centos/binary/swift/swift-proxy-server/config-external.sh @@ -0,0 +1 @@ +../../../../common/swift/swift-proxy-server/config-external.sh \ No newline at end of file diff --git a/docker/centos/binary/swift/swift-proxy-server/config-internal.sh b/docker/centos/binary/swift/swift-proxy-server/config-internal.sh new file mode 120000 index 000000000..f95866fdd --- /dev/null +++ b/docker/centos/binary/swift/swift-proxy-server/config-internal.sh @@ -0,0 +1 @@ +../../../../common/swift/swift-proxy-server/config-internal.sh \ No newline at end of file -- cgit v1.2.3