start netplugin at bootup

Author: shaleman

Vagrantfile

@@ -86,11 +86,14 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
         node_peers += ["#{node_name}=http://#{node_addr}:2380,#{node_name}=http://#{node_addr}:7001"]
         consul_join_flag = if n > 0 then "-join #{node_ips[0]}" else "" end
         consul_bootstrap_flag = "-bootstrap-expect=3"
+        swarm_flag = "slave"
         if num_nodes < 3 then
             if n == 0 then
                 consul_bootstrap_flag = "-bootstrap"
+                swarm_flag = "master"
             else
                 consul_bootstrap_flag = ""
+                swarm_flag = "slave"
             end
         end
         config.vm.define node_name do |node|
@@ -136,15 +139,17 @@ set -x
  -bind=#{node_addr} -data-dir /opt/consul 0<&- &>/tmp/consul.log &) || exit 1
 
 # start swarm
-(nohup #{gopath_folder}/src/github.com/contiv/netplugin/scripts/start-swarm.sh #{node_addr} > /tmp/start-swarm.log &) || exit 1
+(nohup #{gopath_folder}/src/github.com/contiv/netplugin/scripts/start-swarm.sh #{node_addr} #{swarm_flag}> /tmp/start-swarm.log &) || exit 1
 
 SCRIPT
             node.vm.provision "shell", run: "always" do |s|
                 s.inline = provision_node
             end
 
             # forward netmaster port
-            # node.vm.network "forwarded_port", guest: 9999, host: 8080 + n
+            if n == 0 then
+                node.vm.network "forwarded_port", guest: 9999, host: 8080
+            end
         end
     end
 end

scripts/cleanup

@@ -26,8 +26,16 @@ then
     exit 1
 fi
 
+# stop netmaster and netplugin if they are running
+killall netplugin
+killall netmaster
+
+# Cleanup etcd and consul state
 etcdctl rm -recursive /contiv > /dev/null 2>&1
+etcdctl rm -recursive /contiv.io > /dev/null 2>&1
 curl -X DELETE http://localhost:8500/v1/kv/contiv?recurse > /dev/null 2>&1
+
+# Cleanup ovs state
 ovs-vsctl del-br contivVlanBridge > /dev/null 2>&1
 ovs-vsctl del-br contivVxlanBridge > /dev/null 2>&1
 

scripts/start-swarm.sh

@@ -1,13 +1,15 @@
 #!/bin/bash
 
-USAGE="Usage: $0 <node-addr>"
+USAGE="Usage: $0 <node-addr> <master|slave>"
 
-if [ $# -ne 1 ]; then
+if [ $# -ne 2 ]; then
     echo $USAGE
     exit 1
 fi
 
 node_addr=$1
+mode=$2
+source /etc/profile.d/envvar.sh
 
 echo "start-swarm waiting for etcd"
 
@@ -18,10 +20,21 @@ while [[ `etcdctl cluster-health | head -n 1` != "cluster is healthy" ]]; do
     etcdctl cluster-health;
 done
 
-echo "starting swarm on " $node_addr
-
+echo "starting swarm in" $mode "mode on" $node_addr
+echo "starting swarm join"
 # Start swarm discovery
 nohup /usr/bin/swarm join --advertise=$node_addr:2385 etcd://localhost:2379 > /tmp/swarm-join.log 2>&1 &
 
-# Start swarm manager
-nohup /usr/bin/swarm manage -H tcp://$node_addr:2375 etcd://localhost:2379 > /tmp/swarm-manage.log 2>&1 &
+echo "starting netplugin"
+# start netplugin
+nohup /opt/gopath/bin/netplugin -native-integration=true > /tmp/netplugin.log 2>&1 &
+
+if [[ $mode == "master" ]]; then
+    echo "starting swarm manager"
+    # Start swarm manager
+    nohup /usr/bin/swarm manage -H tcp://$node_addr:2375 etcd://localhost:2379 > /tmp/swarm-manage.log 2>&1 &
+
+    echo "starting netmaster"
+    #start netmaster
+    nohup /opt/gopath/bin/netmaster > /tmp/netmaster.log 2>&1 &
+fi