Merge pull request #929 from contiv/master

merge for release 1.1.1

Author: rchirakk

Makefile

@@ -262,8 +262,8 @@ host-integ-test: host-cleanup start-aci-gw
 
 start-aci-gw:
 	@echo dev: starting aci gw...
-	docker pull contiv/aci-gw:11-28-2016.1.3_2i
-	docker run --net=host -itd -e "APIC_URL=SANITY" -e "APIC_USERNAME=IGNORE" -e "APIC_PASSWORD=IGNORE" --name=contiv-aci-gw contiv/aci-gw:11-28-2016.1.3_2i
+	docker pull contiv/aci-gw:04-12-2017.2.2_1n
+	docker run --net=host -itd -e "APIC_URL=SANITY" -e "APIC_USERNAME=IGNORE" -e "APIC_PASSWORD=IGNORE" --name=contiv-aci-gw contiv/aci-gw:04-12-2017.2.2_1n
 
 host-build-docker-image:
 	./scripts/netContain/build_image.sh

scripts/netContain/scripts/contivNet.sh

@@ -76,8 +76,15 @@ 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 list-br | grep contiv | xargs -I % ovs-vsctl del-br % > /dev/null 2>&1
+	ovs-vsctl del-br contivVlanBridge || true
+	ovs-vsctl del-br contivVxlanBridge || true
 	for p in $(ifconfig | grep vport | awk '{print $1}'); do
 		ip link delete $p type veth
 	done
@@ -94,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/
 
@@ -134,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

scripts/netContain/scripts/ovsInit.sh

@@ -3,6 +3,8 @@
 
 set -euo pipefail
 
+modprobe openvswitch
+
 mkdir -p /var/run/openvswitch
 
 sleep 2