From aba23040d3798de306197670f34003a2a656fecc Mon Sep 17 00:00:00 2001
From: Bill Robinson <dseevr@users.noreply.github.com>
Date: Wed, 19 Jul 2017 12:02:59 -0700
Subject: [PATCH] scripts/netContain/scripts/{contivNet.sh,ovsInit.sh}: init
 OVS before doing anything else and load OVS kernel module before starting OVS
 services

Signed-off-by: Bill Robinson <dseevr@users.noreply.github.com>
---
 scripts/netContain/scripts/contivNet.sh | 13 ++++++-------
 scripts/netContain/scripts/ovsInit.sh   |  2 ++
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/scripts/netContain/scripts/contivNet.sh b/scripts/netContain/scripts/contivNet.sh
index f91d13878..8a75c5fa1 100755
--- a/scripts/netContain/scripts/contivNet.sh
+++ b/scripts/netContain/scripts/contivNet.sh
@@ -76,6 +76,12 @@ while getopts ":xmp:v:i:c:drl:o:" opt; do
 	esac
 done
 
+if [ $cleanup == false ] && [ $netplugin == true ]; then
+	echo "Initializing OVS"
+	/contiv/scripts/ovsInit.sh
+	echo "Initialized OVS"
+fi
+
 if [ $cleanup == true ] || [ $reinit == true ]; then
 	ovs-vsctl del-br contivVlanBridge || true
 	ovs-vsctl del-br contivVxlanBridge || true
@@ -95,12 +101,6 @@ if [ $netplugin == false ] && [ $netmaster == false ]; then
 	exit 1
 fi
 
-if [ $netplugin == true ]; then
-	echo "Initializing OVS"
-	/contiv/scripts/ovsInit.sh
-	echo "Initialized OVS"
-fi
-
 mkdir -p /opt/contiv/
 mkdir -p /var/contiv/log/
 
@@ -135,7 +135,6 @@ if [ $netmaster == true ]; then
 	done
 elif [ $netplugin == true ]; then
 	echo "Starting netplugin"
-	modprobe openvswitch
 
 	while true; do
 		if [ -f /tmp/restart_netplugin ]; then
diff --git a/scripts/netContain/scripts/ovsInit.sh b/scripts/netContain/scripts/ovsInit.sh
index 771431114..226e2292e 100755
--- a/scripts/netContain/scripts/ovsInit.sh
+++ b/scripts/netContain/scripts/ovsInit.sh
@@ -3,6 +3,8 @@
 
 set -euo pipefail
 
+modprobe openvswitch
+
 mkdir -p /var/run/openvswitch
 
 sleep 2