v2plugin set forward mode when netmaster up

Docker expects the netplugin socket to be available within 10 seconds
before it fails enabling (or installing) the v2plugin.

Due to contiv#1043, netplugin is blocking waiting for the forward mode to be
set, which is done by netctl calling netmaster, but netmaster is not
started until the plugin is activating.

Instead of backgrounding the plugin install/enabling then letting
ansible set the forward mode, do it in the plugin script to avoid
ansible's unpredictable round trip delays.

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

Author: chrisplo

install/v2plugin/config.template

@@ -103,6 +103,14 @@
           ],
           ## Do not change the default value, this will be replaced with $CONTIV_V2PLUGIN_NAME
           "Value": "__CONTIV_V2PLUGIN_NAME__"
+       },
+       {
+          "Description": "Forwarding mode for netplugin",
+          "Name": "fwd_mode",
+          "Settable": [
+             "value"
+          ],
+          "Value": "bridge"
        }
     ],
     "mounts": [

install/v2plugin/startcontiv.sh

@@ -50,7 +50,7 @@ echo "  Starting OVSBD server " >> $BOOTUP_LOGFILE
 ovsdb-server --remote=punix:/var/run/openvswitch/db.sock --remote=db:Open_vSwitch,Open_vSwitch,manager_options --private-key=db:Open_vSwitch,SSL,private_key --certificate=db:Open_vSwitch,SSL,certificate --bootstrap-ca-cert=db:Open_vSwitch,SSL,ca_cert --log-file=$log_dir/ovs-db.log -vsyslog:dbg -vfile:dbg --pidfile --detach /etc/openvswitch/conf.db >> $BOOTUP_LOGFILE
 echo "  Starting ovs-vswitchd " >> $BOOTUP_LOGFILE
 ovs-vswitchd -v --pidfile --detach --log-file=$log_dir/ovs-vswitchd.log -vconsole:err -vsyslog:info -vfile:info &
-ovs-vsctl set-manager tcp:127.0.0.1:6640 
+ovs-vsctl set-manager tcp:127.0.0.1:6640
 ovs-vsctl set-manager ptcp:6640
 
 echo "Started OVS, logs in $log_dir" >> $BOOTUP_LOGFILE
@@ -77,9 +77,22 @@ if [ $plugin_role == "master" ]; then
         sleep 5
         echo "Restarting Netmaster " >> $BOOTUP_LOGFILE
     done &
+
+    echo "Waiting for netmaster to be ready for connections" >> $BOOTUP_LOGFILE
+    # wait till netmaster starts to listen
+    for i in {1..10}; do
+        curl --connect-timeout 1 --max-time 2 -s --fail $control_url >/dev/null \
+            && break
+    done
+    if (( i >= 10 )); then
+        echo "Failed to set forwarding mode, plugin will fail to enable" >> $BOOTUP_LOGFILE
+        exit 1
+    fi
+    echo "Netmaster is ready for connections, setting forward mode" >> $BOOTUP_LOGFILE
+    netctl --netmaster $contol_url global set --fwd-mode "$fwd_mode"
+    echo "Forward mode is set" >> $BOOTUP_LOGFILE
 else
     echo "Not starting netmaster as plugin role is" $plugin_role >> $BOOTUP_LOGFILE
 fi
 
 while true; do sleep 1; done
-