From d2d3e74e193b2ec5bdda8029b75218a10435a9a4 Mon Sep 17 00:00:00 2001 From: digambar Date: Fri, 3 Jul 2015 12:09:46 +0530 Subject: Add config-internal/config-external to OpenvSwitch containers Partially Implements: Blueprint standard-start Co-Authored-By: Swapnil Kulkarni Change-Id: I52ed4b56efe3fc4ebbc108b2fe7e9d69eb0f0928 --- docker/centos/binary/openvswitch/ovs-base/Dockerfile | 2 ++ docker/centos/binary/openvswitch/ovs-base/config-external.sh | 1 + docker/centos/binary/openvswitch/ovs-base/config-internal.sh | 1 + docker/centos/binary/openvswitch/ovs-db-server/Dockerfile | 3 ++- docker/centos/binary/openvswitch/ovs-db-server/config-external.sh | 1 + docker/centos/binary/openvswitch/ovs-db-server/config-internal.sh | 1 + docker/centos/binary/openvswitch/ovs-vswitchd/Dockerfile | 2 ++ docker/centos/binary/openvswitch/ovs-vswitchd/config-external.sh | 1 + docker/centos/binary/openvswitch/ovs-vswitchd/config-internal.sh | 1 + 9 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 docker/centos/binary/openvswitch/ovs-base/config-external.sh create mode 100644 docker/centos/binary/openvswitch/ovs-base/config-internal.sh create mode 120000 docker/centos/binary/openvswitch/ovs-db-server/config-external.sh create mode 120000 docker/centos/binary/openvswitch/ovs-db-server/config-internal.sh create mode 120000 docker/centos/binary/openvswitch/ovs-vswitchd/config-external.sh create mode 120000 docker/centos/binary/openvswitch/ovs-vswitchd/config-internal.sh (limited to 'docker/centos/binary/openvswitch') diff --git a/docker/centos/binary/openvswitch/ovs-base/Dockerfile b/docker/centos/binary/openvswitch/ovs-base/Dockerfile index 7d4ade54c..98506b477 100644 --- a/docker/centos/binary/openvswitch/ovs-base/Dockerfile +++ b/docker/centos/binary/openvswitch/ovs-base/Dockerfile @@ -3,3 +3,5 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) RUN yum install -y openvswitch \ && yum clean all + +COPY config-internal.sh config-external.sh /opt/kolla/ diff --git a/docker/centos/binary/openvswitch/ovs-base/config-external.sh b/docker/centos/binary/openvswitch/ovs-base/config-external.sh new file mode 100644 index 000000000..fc177a286 --- /dev/null +++ b/docker/centos/binary/openvswitch/ovs-base/config-external.sh @@ -0,0 +1 @@ +../../../../common/openvswitch/ovs-base/config-external.sh diff --git a/docker/centos/binary/openvswitch/ovs-base/config-internal.sh b/docker/centos/binary/openvswitch/ovs-base/config-internal.sh new file mode 100644 index 000000000..fc177a286 --- /dev/null +++ b/docker/centos/binary/openvswitch/ovs-base/config-internal.sh @@ -0,0 +1 @@ +../../../../common/openvswitch/ovs-base/config-external.sh diff --git a/docker/centos/binary/openvswitch/ovs-db-server/Dockerfile b/docker/centos/binary/openvswitch/ovs-db-server/Dockerfile index 5728995b3..c34d72302 100644 --- a/docker/centos/binary/openvswitch/ovs-db-server/Dockerfile +++ b/docker/centos/binary/openvswitch/ovs-db-server/Dockerfile @@ -3,5 +3,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY ./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/openvswitch/ovs-db-server/config-external.sh b/docker/centos/binary/openvswitch/ovs-db-server/config-external.sh new file mode 120000 index 000000000..36670d77d --- /dev/null +++ b/docker/centos/binary/openvswitch/ovs-db-server/config-external.sh @@ -0,0 +1 @@ +../../../../common/openvswitch/ovs-db-server/config-external.sh \ No newline at end of file diff --git a/docker/centos/binary/openvswitch/ovs-db-server/config-internal.sh b/docker/centos/binary/openvswitch/ovs-db-server/config-internal.sh new file mode 120000 index 000000000..86927f3dd --- /dev/null +++ b/docker/centos/binary/openvswitch/ovs-db-server/config-internal.sh @@ -0,0 +1 @@ +../../../../common/openvswitch/ovs-db-server/config-internal.sh \ No newline at end of file diff --git a/docker/centos/binary/openvswitch/ovs-vswitchd/Dockerfile b/docker/centos/binary/openvswitch/ovs-vswitchd/Dockerfile index 4acdb5d53..c34d72302 100644 --- a/docker/centos/binary/openvswitch/ovs-vswitchd/Dockerfile +++ b/docker/centos/binary/openvswitch/ovs-vswitchd/Dockerfile @@ -3,4 +3,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY ./start.sh /start.sh +COPY config-internal.sh config-external.sh /opt/kolla/ + CMD ["/start.sh"] diff --git a/docker/centos/binary/openvswitch/ovs-vswitchd/config-external.sh b/docker/centos/binary/openvswitch/ovs-vswitchd/config-external.sh new file mode 120000 index 000000000..39b5c7dd6 --- /dev/null +++ b/docker/centos/binary/openvswitch/ovs-vswitchd/config-external.sh @@ -0,0 +1 @@ +../../../../common/openvswitch/ovs-vswitchd/config-external.sh \ No newline at end of file diff --git a/docker/centos/binary/openvswitch/ovs-vswitchd/config-internal.sh b/docker/centos/binary/openvswitch/ovs-vswitchd/config-internal.sh new file mode 120000 index 000000000..dec53e36d --- /dev/null +++ b/docker/centos/binary/openvswitch/ovs-vswitchd/config-internal.sh @@ -0,0 +1 @@ +../../../../common/openvswitch/ovs-vswitchd/config-internal.sh \ No newline at end of file -- cgit v1.2.3