diff options
Diffstat (limited to 'docker/common')
4 files changed, 2 insertions, 29 deletions
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 f233418a7..000000000 --- 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 ae87da4e2..89b2e3e92 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 2e42f7029..000000000 --- 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 148ad5b56..3ec2c26b2 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 |