fix v2plugin startcontiv.sh for netplugin updates

run startcontiv.sh with bash

start netplugin after netmaster

set network and forward modes for v2plugin
netplugin will not start without setting the network and forward modes

Signed-off-by: Chris Plock <[email protected]>

Author: chrisplo

install/v2plugin/Dockerfile

@@ -5,7 +5,8 @@ LABEL maintainer "Cisco Contiv (https://contiv.github.io)"
 
 RUN mkdir -p /run/docker/plugins /etc/openvswitch /var/run/contiv/log \
  && echo 'http://dl-cdn.alpinelinux.org/alpine/v3.4/main' >> /etc/apk/repositories \
- && apk --no-cache add openvswitch=2.5.0-r0 iptables ca-certificates openssl curl \
+ && apk --no-cache add \
+      openvswitch=2.5.0-r0 iptables ca-certificates openssl curl bash \
  && wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://raw.githubusercontent.com/andyshinn/alpine-pkg-glibc/master/sgerrand.rsa.pub \
  && wget https://github.com/andyshinn/alpine-pkg-glibc/releases/download/2.23-r1/glibc-2.23-r1.apk \
  && apk --no-cache add glibc-2.23-r1.apk

install/v2plugin/startcontiv.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 ### Pre-requisite on the host
 # run a cluster store like etcd or consul
@@ -71,16 +71,6 @@ echo "Started OVS, logs in $log_dir" >> $BOOTUP_LOGFILE
 
 set +e
 
-echo "Starting Netplugin " >> $BOOTUP_LOGFILE
-while true ; do
-    echo "/netplugin $dbg_flag --plugin-mode=$plugin_mode $vxlan_port_cfg --vlan-if=$iflist $store_arg $ctrl_ip_cfg $vtep_ip_cfg" >> $BOOTUP_LOGFILE
-    /netplugin $dbg_flag --plugin-mode=$plugin_mode $vxlan_port_cfg --vlan-if=$iflist $store_arg $ctrl_ip_cfg $vtep_ip_cfg &> $log_dir/netplugin.log
-    echo "CRITICAL : Net Plugin has exited, Respawn in 5" >> $BOOTUP_LOGFILE
-    mv $log_dir/netplugin.log $log_dir/netplugin.log.lastrun
-    sleep 5
-    echo "Restarting Netplugin " >> $BOOTUP_LOGFILE
-done &
-
 if [ $plugin_role == "master" ]; then
     if [ -z "$fwd_mode" ]; then
         echo "fwd_mode is not set, plugin cannot be enabled"
@@ -116,4 +106,23 @@ else
     echo "Not starting netmaster as plugin role is" $plugin_role >> $BOOTUP_LOGFILE
 fi
 
+if [[ "$fwd_mode" == "bridge" ]]; then
+    network_mode=vlan
+else
+    network_mode=vxlan
+fi
+
+echo "Starting Netplugin"
+while true ; do
+    set -x
+    /netplugin $dbg_flag --plugin-mode=$plugin_mode $vxlan_port_cfg \
+        --vlan-if=$iflist $store_arg $ctrl_ip_cfg $vtep_ip_cfg \
+        --netmode $network_mode --fwdmode $fwd_mode &> $log_dir/netplugin.log
+    set +x
+    echo "CRITICAL : Net Plugin has exited, Respawn in 5"
+    mv $log_dir/netplugin.log $log_dir/netplugin.log.lastrun
+    sleep 5
+    echo "Restarting Netplugin"
+done &
+
 while true; do sleep 1; done