aboutsummaryrefslogtreecommitdiff
path: root/docker/common/openvswitch/ovs-vswitchd
diff options
context:
space:
mode:
authorSam Yaple <sam@yaple.net>2015-08-07 17:52:20 +0000
committerSam Yaple <sam@yaple.net>2015-08-07 17:52:20 +0000
commit3cfd5265aedc9f822ae57c4b522744e518eccbe0 (patch)
treef9e6f2a4d0172498b6744861a8ed1c009d9d3c6d /docker/common/openvswitch/ovs-vswitchd
parenta5e907a8e91bc4e1d8f563dc79db0ee96c15d380 (diff)
downloadkolla-3cfd5265aedc9f822ae57c4b522744e518eccbe0.tar.gz
kolla-3cfd5265aedc9f822ae57c4b522744e518eccbe0.zip
Remove config-internal for openvswitch
Change-Id: I4b8f275b670a1ac3b72b2af34b53bddca4a63cb2 Partially-Implements: blueprint remove-config-internal
Diffstat (limited to 'docker/common/openvswitch/ovs-vswitchd')
-rwxr-xr-xdocker/common/openvswitch/ovs-vswitchd/config-internal.sh12
-rwxr-xr-xdocker/common/openvswitch/ovs-vswitchd/start.sh2
2 files changed, 1 insertions, 13 deletions
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