Add reinit option to cleanup any existing ovs bridges

Fixes contiv#61

install/k8s/contiv.yaml

@@ -28,6 +28,7 @@ spec:
           image: contiv/netplugin:__CONTIV_VERSION__
           args:
             - -pkubernetes
+            - -x
           env:
             - name: VLAN_IF
               value: __VLAN_IF__

install/k8s/install.sh

@@ -245,7 +245,7 @@ cp ./netctl /usr/bin/
 kubectl apply -f $contiv_yaml
 if [ "$fwd_mode" = "routing" ]; then
   sleep 60
-  ./netctl --netmaster http://$netmaster:9999 global set --fwd-mode routing
+  netctl --netmaster http://$netmaster:9999 global set --fwd-mode routing
 else
   kubectl get deployment/kube-dns -n kube-system -o json  > kube-dns.yaml
   kubectl delete deployment/kube-dns -n kube-system

install/k8s/uninstall.sh

@@ -2,7 +2,7 @@
 
 set -euo pipefail
 
-if [ "$1" = "-h" ]; then
+if [ "$#" -eq 1 ] && [ "$1" = "-h" ]; then
   echo "Usage: ./install/k8s/uninstall.sh to uninstall contiv"
   echo "       ./install/k8s/uninstall.sh etcd-cleanup to uninstall contiv and cleanup contiv data"
   exit 1
@@ -13,9 +13,10 @@ kubectl delete secret aci.key -n kube-system
 # Delete Contiv pods
 kubectl delete -f .contiv.yaml
 
-if [ "$1" = "etcd-cleanup" ]; then
+if [ "$#" -eq 1 ] && [ "$1" = "etcd-cleanup" ]; then
   rm -rf /var/etcd/contiv-data
 fi
 
 # Re-creating the kube-dns deployment
 kubectl create -f kube-dns.yaml
+