Merge pull request contiv#192 from shaleman/sdemo

shaleman · shaleman · commit 7a8b8eb89ea3 · 2015-11-20T02:19:32.000+01:00
simplify make demo
diff --git a/Makefile b/Makefile
@@ -41,7 +41,6 @@ host-build:
 
 run-build: deps checks clean
 	godep go install -v $(TO_BUILD)
-	cp ./scripts/python/contivctl.py $(GOPATH)/bin/contivctl
 
 build:
 	make start
@@ -67,7 +66,14 @@ demo-centos:
 stop:
 	CONTIV_NODES=$${CONTIV_NODES:-2} vagrant destroy -f
 
-demo: stop start
+demo:
+	vagrant up
+	vagrant ssh netplugin-node1 -c 'sudo -i bash -lc "source /etc/profile.d/envvar.sh && cd /opt/gopath/src/github.com/contiv/netplugin && make run-build"'
+	vagrant ssh netplugin-node1 -c 'nohup bash -lc "sudo /opt/gopath/bin/netplugin -docker-plugin 2>&1> /tmp/netplugin.log &"'
+	vagrant ssh netplugin-node2 -c 'nohup bash -lc "sudo /opt/gopath/bin/netplugin -docker-plugin 2>&1> /tmp/netplugin.log &"'
+	sleep 10
+	vagrant ssh netplugin-node1 -c 'nohup bash -lc "/opt/gopath/bin/netmaster 2>&1> /tmp/netmaster.log &"'
+	sleep 10
 
 start-dockerdemo:
 	scripts/dockerhost/start-dockerhosts
diff --git a/README.md b/README.md
@@ -19,31 +19,21 @@ This will provide you with a minimal experience of uploading the intent and
 seeing the netplugin system act on it. It will create a network on your host
 that lives behind an OVS bridge and has its own unique interfaces.
 
-#### Step 1: Clone the project:
+#### Step 1: Clone the project and bringup the VMs
 
 ```
-$ export GOPATH=`pwd`
-$ mkdir -p src/github.com/contiv
-$ cd src/github.com/contiv
 $ git clone https://github.com/contiv/netplugin
-$ cd netplugin; make build demo ssh
+$ cd netplugin; make demo
+$ vagrant ssh netplugin-node1
 ```
 
-#### Step 2: Inside the VM, boot `netmaster` and `netplugin`
+#### Step 2: Create a network
 
 ```
-$ cd /opt/gopath/src/github.com/contiv/netplugin
-$ sudo $GOPATH/bin/netmaster &
-$ sudo $GOPATH/bin/netplugin -docker-plugin &
+$ netctl net create contiv-net --subnet=20.1.1.0/24 --gateway=20.1.1.254 --pkt-tag=200
 ```
 
-#### Step 3: Create a network
-
-```
-$ $GOPATH/bin/netctl net create contiv-net --subnet=20.1.1.0/24 --gateway=20.1.1.254 --pktTag=200
-```
-
-#### Step 4: Run your containers and enjoy the networking!
+#### Step 3: Run your containers and enjoy the networking!
 
 ```
 $ docker run -itd --name=web --net=contiv-net ubuntu /bin/bash
diff --git a/Vagrantfile b/Vagrantfile
@@ -75,7 +75,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
         config.vm.box = "contiv/ubuntu1504-netplugin"
         config.vm.box_version = "0.3.1"
     end
-    num_nodes = 1
+    num_nodes = 2
     if ENV['CONTIV_NODES'] && ENV['CONTIV_NODES'] != "" then
         num_nodes = ENV['CONTIV_NODES'].to_i
     end
@@ -119,10 +119,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
             # mount the host directories
             node.vm.synced_folder "bin", File.join(gopath_folder, "bin")
-            if ENV["GOPATH"]
+            if ENV["GOPATH"] && ENV['GOPATH'] != ""
               node.vm.synced_folder File.join(ENV["GOPATH"].split(":").first, "src"), File.join(gopath_folder, "src"), rsync: true
             else
-              puts "!!! No GOPATH, mounting netplugin by itself"
               node.vm.synced_folder ".", File.join(gopath_folder, "src/github.com/contiv/netplugin"), rsync: true
             end
 
