v2plugin fixes

Author: gkvijay

Makefile

@@ -273,7 +273,7 @@ host-plugin-restart:
 
 # complete workflow to create rootfs, create/enable plugin and start swarm-mode
 demo-v2plugin:
-	CONTIV_V2PLUGIN_NAME="$${CONTIV_V2PLUGIN_NAME:-contiv/v2plugin:0.1}" CONTIV_DOCKER_VERSION="$${CONTIV_DOCKER_VERSION:-1.13.1}" CONTIV_DOCKER_SWARM="$${CONTIV_DOCKER_SWARM:-swarm_mode}" make ssh-build
+	CONTIV_V2PLUGIN_NAME="$${CONTIV_V2PLUGIN_NAME:-contiv/v2plugin:0.1}" CONTIV_DOCKER_VERSION="$${CONTIV_DOCKER_VERSION:-1.13.1}" CONTIV_DOCKER_SWARM="$${CONTIV_DOCKER_SWARM:-classic_mode}" make ssh-build
 	vagrant ssh netplugin-node1 -c 'bash -lc "source /etc/profile.d/envvar.sh && cd /opt/gopath/src/github.com/contiv/netplugin && make host-pluginfs-create && make host-plugin-restart && make host-swarm-restart"'
 
 only-tar:

install/v2plugin/Dockerfile

@@ -3,11 +3,12 @@
 FROM alpine:3.5
 MAINTAINER Cisco Contiv (https://contiv.github.io/)
 
-RUN mkdir -p /run/docker/plugins \
- && mkdir -p /etc/openvswitch \
- && mkdir -p /var/run/contiv/log \
+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
+ && apk --no-cache add openvswitch=2.5.0-r0 iptables ca-certificates openssl \
+ && 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
 
 COPY netplugin netmaster netctl startcontiv.sh /
 

install/v2plugin/startcontiv.sh

@@ -1,6 +1,4 @@
-#!/bin/bash
-
-set -e 
+#!/bin/sh
 
 ### Pre-requisite on the host
 # run a cluster store like etcd or consul
@@ -29,36 +27,38 @@ fi
 echo "Loading OVS" >> $BOOTUP_LOGFILE
 (modprobe openvswitch) || (echo "Load ovs FAILED!!! " >> $BOOTUP_LOGFILE && while true; do sleep 1; done)
 
-echo "Starting OVS" >> $BOOTUP_LOGFILE
-/usr/share/openvswitch/scripts/ovs-ctl restart --system-id=random --with-logdir=/var/run/contiv/log
+echo "  Cleaning up ovsdb files" >> $BOOTUP_LOGFILE
+rm -rf /var/run/openvswitch/*
+rm -rf /etc/openvswitch/conf.db
+rm -rf /etc/openvswitch/.conf.db.~lock~
+
+echo "  Creating OVS DB" >> $BOOTUP_LOGFILE
+(ovsdb-tool create  /etc/openvswitch/conf.db /usr/share/openvswitch/vswitch.ovsschema) || (while true; do sleep 1; done)
+
+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=/var/run/contiv/log/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=/var/run/contiv/log/ovs-vswitchd.log -vconsole:err -vsyslog:info -vfile:info &
+ovs-vsctl set-manager tcp:127.0.0.1:6640 
+ovs-vsctl set-manager ptcp:6640
+
+echo "Started OVS" >> $BOOTUP_LOGFILE
 
 echo "Starting Netplugin " >> $BOOTUP_LOGFILE
-netplugin_retry="0"
-while [ true ]; do
+while true ; do
     echo "/netplugin $dbg_flag -plugin-mode docker -vlan-if $iflist -cluster-store $cluster_store $ctrl_ip_cfg $vtep_ip_cfg" >> $BOOTUP_LOGFILE
-    /netplugin $dbg_flag -plugin-mode docker -vlan-if $iflist -cluster-store $cluster_store $ctrl_ip_cfg $vtep_ip_cfg &>> /var/run/contiv/log/netplugin.log
-    ((netplugin_retry++))
-    if [ $netplugin_retry == "10" ] ; then 
-        echo "Giving up after $netplugin_retry retries" >> $BOOTUP_LOGFILE
-        exit
-    fi
-    echo "CRITICAL : Net Plugin has exited, Respawn in 5" >> $BOOTUP_LOGFILE
+    /netplugin $dbg_flag -plugin-mode docker -vlan-if $iflist -cluster-store $cluster_store $ctrl_ip_cfg $vtep_ip_cfg &> /var/run/contiv/log/netplugin.log
+    echo "CRITICAL : Net Plugin has exited, Respawn in 5s" >> $BOOTUP_LOGFILE
     sleep 5
     echo "Restarting Netplugin " >> $BOOTUP_LOGFILE
 done &
 
 if [ $plugin_role == "master" ]; then
     echo "Starting Netmaster " >> $BOOTUP_LOGFILE
-    netmaster_retry=0
-    while [ true ]; do
+    while  true ; do
         echo "/netmaster $dbg_flag -plugin-name=$plugin_name -cluster-store=$cluster_store $listen_url_cfg " >> $BOOTUP_LOGFILE
-        /netmaster $dbg_flag -plugin-name=$plugin_name -cluster-store=$cluster_store $listen_url_cfg &>> /var/run/contiv/log/netmaster.log
-        ((netmaster_retry++))
-        if [ $netmaster_retry == "10" ] ; then 
-            echo "Giving up after $netmaster_retry retries" >> $BOOTUP_LOGFILE
-            exit
-        fi
-        echo "CRITICAL : Net Master has exited, Respawn in 5" >> $BOOTUP_LOGFILE
+        /netmaster $dbg_flag -plugin-name=$plugin_name -cluster-store=$cluster_store $listen_url_cfg &> /var/run/contiv/log/netmaster.log
+        echo "CRITICAL : Net Master has exited, Respawn in 5s" >> $BOOTUP_LOGFILE
         echo "Restarting Netmaster " >> $BOOTUP_LOGFILE
         sleep 5
     done &

scripts/v2plugin_rootfs.sh

@@ -3,6 +3,8 @@
 # run this script from contiv/netplugin directory
 
 echo "Creating rootfs for v2plugin ", ${CONTIV_V2PLUGIN_NAME}
+rm -rf install/v2plugin/rootfs
+rm install/v2plugin/config.json
 cat install/v2plugin/config.template | grep -v "##" > install/v2plugin/config.json
 sed -i "s%PluginName%${CONTIV_V2PLUGIN_NAME}%" install/v2plugin/config.json
 cp bin/netplugin bin/netmaster bin/netctl install/v2plugin