From 3cfd5265aedc9f822ae57c4b522744e518eccbe0 Mon Sep 17 00:00:00 2001 From: Sam Yaple Date: Fri, 7 Aug 2015 17:52:20 +0000 Subject: [PATCH] Remove config-internal for openvswitch Change-Id: I4b8f275b670a1ac3b72b2af34b53bddca4a63cb2 Partially-Implements: blueprint remove-config-internal --- .../binary/openvswitch/ovs-db-server/Dockerfile | 5 ++--- .../openvswitch/ovs-db-server/config-internal.sh | 1 - .../binary/openvswitch/ovs-vswitchd/Dockerfile | 5 ++--- .../openvswitch/ovs-vswitchd/config-internal.sh | 1 - .../openvswitch/ovs-db-server/config-internal.sh | 15 --------------- docker/common/openvswitch/ovs-db-server/start.sh | 2 +- .../openvswitch/ovs-vswitchd/config-internal.sh | 12 ------------ docker/common/openvswitch/ovs-vswitchd/start.sh | 2 +- docs/minimal-environment-vars.md | 5 ++--- 9 files changed, 8 insertions(+), 40 deletions(-) delete mode 120000 docker/centos/binary/openvswitch/ovs-db-server/config-internal.sh delete mode 120000 docker/centos/binary/openvswitch/ovs-vswitchd/config-internal.sh delete mode 100755 docker/common/openvswitch/ovs-db-server/config-internal.sh delete mode 100755 docker/common/openvswitch/ovs-vswitchd/config-internal.sh diff --git a/docker/centos/binary/openvswitch/ovs-db-server/Dockerfile b/docker/centos/binary/openvswitch/ovs-db-server/Dockerfile index c34d72302b..8dcc5dc670 100644 --- a/docker/centos/binary/openvswitch/ovs-db-server/Dockerfile +++ b/docker/centos/binary/openvswitch/ovs-db-server/Dockerfile @@ -1,8 +1,7 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ovs-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 start.sh / +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/binary/openvswitch/ovs-db-server/config-internal.sh b/docker/centos/binary/openvswitch/ovs-db-server/config-internal.sh deleted file mode 120000 index 86927f3ddf..0000000000 --- a/docker/centos/binary/openvswitch/ovs-db-server/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../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 60989c846c..bb7ec8c670 100644 --- a/docker/centos/binary/openvswitch/ovs-vswitchd/Dockerfile +++ b/docker/centos/binary/openvswitch/ovs-vswitchd/Dockerfile @@ -1,8 +1,7 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ovs-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) -COPY ./start.sh /start.sh - -COPY ovs_ensure_configured.sh config-internal.sh config-external.sh /opt/kolla/ +COPY start.sh / +COPY ovs_ensure_configured.sh config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/binary/openvswitch/ovs-vswitchd/config-internal.sh b/docker/centos/binary/openvswitch/ovs-vswitchd/config-internal.sh deleted file mode 120000 index dec53e36d4..0000000000 --- a/docker/centos/binary/openvswitch/ovs-vswitchd/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/openvswitch/ovs-vswitchd/config-internal.sh \ No newline at end of file diff --git a/docker/common/openvswitch/ovs-db-server/config-internal.sh b/docker/common/openvswitch/ovs-db-server/config-internal.sh deleted file mode 100755 index f233418a76..0000000000 --- a/docker/common/openvswitch/ovs-db-server/config-internal.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -set -o errexit - -check_required_vars OVS_DB_FILE \ - OVS_UNIXSOCK - - -mkdir -p "$(dirname $OVS_UNIXSOCK)" - -if [[ ! -e "${OVS_DB_FILE}" ]]; then - ovsdb-tool create "${OVS_DB_FILE}" -fi - -exec ovsdb-server $OVS_DB_FILE -vconsole:emer -vsyslog:err -vfile:info --remote=punix:"${OVS_UNIXSOCK}" --log-file="${OVS_LOG_FILE}" diff --git a/docker/common/openvswitch/ovs-db-server/start.sh b/docker/common/openvswitch/ovs-db-server/start.sh index ae87da4e24..89b2e3e92b 100755 --- a/docker/common/openvswitch/ovs-db-server/start.sh +++ b/docker/common/openvswitch/ovs-db-server/start.sh @@ -13,7 +13,7 @@ ARGS="$DB_FILE -vconsole:emer -vsyslog:err -vfile:info --remote=punix:${UNIXSOCK # Loading common functions. source /opt/kolla/kolla-common.sh -# Config-internal script exec out of this function, it does not return here. +# Execute config strategy set_configs mkdir -p "${UNIXSOCK_DIR}" diff --git a/docker/common/openvswitch/ovs-vswitchd/config-internal.sh b/docker/common/openvswitch/ovs-vswitchd/config-internal.sh deleted file mode 100755 index 2e42f7029d..0000000000 --- a/docker/common/openvswitch/ovs-vswitchd/config-internal.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -set -o errexit - -check_required_vars OVS_UNIXSOCK - -modprobe openvswitch - -mkdir -p "$(dirname $OVS_UNIXSOCK)" - -exec ovs-vswitchd unix:"${OVS_UNIXSOCK}" -vconsole:emer -vsyslog:err -vfile:info --mlockall --log-file="${OVS_LOG_FILE}" - diff --git a/docker/common/openvswitch/ovs-vswitchd/start.sh b/docker/common/openvswitch/ovs-vswitchd/start.sh index 148ad5b569..3ec2c26b22 100755 --- a/docker/common/openvswitch/ovs-vswitchd/start.sh +++ b/docker/common/openvswitch/ovs-vswitchd/start.sh @@ -10,7 +10,7 @@ ARGS="unix:${UNIXSOCK} -vconsole:emer -vsyslog:err -vfile:info --mlockall --log- # Loading common functions. source /opt/kolla/kolla-common.sh -# Config-internal script exec out of this function, it does not return here. +# Execute config strategy set_configs modprobe openvswitch diff --git a/docs/minimal-environment-vars.md b/docs/minimal-environment-vars.md index f33e5a3c48..e549dea215 100644 --- a/docs/minimal-environment-vars.md +++ b/docs/minimal-environment-vars.md @@ -502,12 +502,11 @@ In order for each service to function, there is a minimum set of required variab # Ovs-db-server - OVS_DB_FILE - OVS_UNIXSOCK + None # Ovs-vswitchd - OVS_UNIXSOCK + None # Rabbitmq