From 9c602da75559a4cf65b0b46e05a05503c20f3d71 Mon Sep 17 00:00:00 2001
From: Sukhesh Halemane <shaleman@cisco.com>
Date: Fri, 25 Mar 2016 18:20:43 -0700
Subject: [PATCH 1/3] vagrant setup for mesos,marathon,docker and netplugin

---
 mgmtfn/mesos-docker/README.md      |  85 +++++++++++++++
 mgmtfn/mesos-docker/Vagrantfile    | 169 +++++++++++++++++++++++++++++
 mgmtfn/mesos-docker/docker.json    |  18 +++
 mgmtfn/mesos-docker/launch.sh      |  12 ++
 mgmtfn/mesos-docker/playbook.yml   |  54 +++++++++
 mgmtfn/mesos-docker/startPlugin.sh |   7 ++
 6 files changed, 345 insertions(+)
 create mode 100644 mgmtfn/mesos-docker/README.md
 create mode 100644 mgmtfn/mesos-docker/Vagrantfile
 create mode 100644 mgmtfn/mesos-docker/docker.json
 create mode 100755 mgmtfn/mesos-docker/launch.sh
 create mode 100644 mgmtfn/mesos-docker/playbook.yml
 create mode 100755 mgmtfn/mesos-docker/startPlugin.sh

diff --git a/mgmtfn/mesos-docker/README.md b/mgmtfn/mesos-docker/README.md
new file mode 100644
index 000000000..652ed14fb
--- /dev/null
+++ b/mgmtfn/mesos-docker/README.md
@@ -0,0 +1,85 @@
+# Netplugin with Mesos Marathon
+
+This document explains how to use Netplugin with Mesos Marathon. Currently, netplugin supports docker containerizer with Mesos Marathon.
+
+## Getting started with Vagrant VMs
+### Prerequisits
+- Virtualbox 5.0.2 or higher
+- Vagrant 1.7.4 or higher
+- ansible 1.9.4 or higher
+
+### Step 1: Bring up the vagrant VMs
+
+```
+$ git clone https://github.com/contiv/netplugin
+$ cd netplugin/mgmtfn/mesos-docker
+$ vagrant up
+```
+
+This will bring up a two node Vagrant setup with Mesos, Marathon and docker.
+Bringing up vagrant VMs and provisioning them can take few minutes to complete since it needs to download the VM images and mesos/marathon binaries. Please be patient.
+
+### Step 2: Build netplugin binaries
+
+```
+$ vagrant ssh node1
+< Inside the VM>
+$ cd /opt/gopath/src/github.com/contiv/netplugin
+$ make host-build
+```
+
+### Step 3: Start netplugin
+
+```
+$ cd mgmtfn/mesos-docker
+$ ./startPlugin.sh
+```
+
+This will start netplugin and netmaster processes on both VMs in the setup.
+This will also create a network called `contiv` to launch marathon containers
+
+### Step 4: Launch containers
+
+`docker.json` file in mgmtfn/mesos-docker directory has an example marathon app definition.
+
+```
+
+  "container": {
+    "type": "DOCKER",
+    "docker": {
+      "image": "libmesos/ubuntu",
+      "parameters": [ { "key": "net", "value": "contiv" } ]
+    }
+  },
+  "id": "ubuntu",
+  "instances": 2,
+  "constraints": [ ["hostname", "UNIQUE", ""] ],
+  "cpus": 1,
+  "mem": 128,
+  "uris": [],
+  "cmd": "while sleep 10; do date -u +%T; done"
+}
+```
+
+This example application definition launches two ubuntu containers with a constraint that both containers be spread on different hosts.
+Note that there is a special `net` parameter used in this specification `"parameters": [ { "key": "net", "value": "contiv" } ]`. This tells docker to launch the application in contiv network that we created in step 3.
+
+You can launch this application using following command
+
+```
+$ ./launch.sh docker.json
+```
+
+Launching the container can take few minutes depending on how long it takes to pull the image.
+Once its launched, you should be able to see the containers using docker commands
+
+```
+$ docker ps
+CONTAINER ID        IMAGE               COMMAND                  CREATED             STATUS              PORTS               NAMES
+2a68fed77d5a        libmesos/ubuntu     "/bin/sh -c 'while sl"   About an hour ago   Up About an hour                       mesos-cce1c91f-65fb-457d-99af-5fdd4af14f16-S1.da634e3c-1fde-479a-b100-c61a498bcbe7
+ ```
+
+## Notes
+
+ 1. Mesos and Marathon ports are port-mapped from vagrant VM to host machine. You can access them by logging into localhost:5050 and localhost:8080 respectively.
+ 2. Netmaster web-ui is port-mapped to port 9090 on the host machine
diff --git a/mgmtfn/mesos-docker/Vagrantfile b/mgmtfn/mesos-docker/Vagrantfile
new file mode 100644
index 000000000..7bb0b501b
--- /dev/null
+++ b/mgmtfn/mesos-docker/Vagrantfile
@@ -0,0 +1,169 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+require 'fileutils'
+
+# netplugin_synced_gopath="/opt/golang"
+gopath_folder="/opt/gopath"
+
+ANSIBLE_GROUPS = {
+              "master" => ["node1"],
+              "nodes" => ["node2"],
+              "all_groups:children" => ["master, ""nodes"]
+            }
+
+provision_common = <<SCRIPT
+## setup the environment file. Export the env-vars passed as args to 'vagrant up'
+echo Args passed: [[ $@ ]]
+
+echo -n "$1" > /etc/hostname
+hostname -F /etc/hostname
+
+/sbin/ip addr add "$3/24" dev eth1
+/sbin/ip link set eth1 up
+/sbin/ip link set eth2 up
+
+echo 'export GOPATH=#{gopath_folder}' > /etc/profile.d/envvar.sh
+echo 'export GOBIN=$GOPATH/bin' >> /etc/profile.d/envvar.sh
+echo 'export GOSRC=$GOPATH/src' >> /etc/profile.d/envvar.sh
+echo 'export PATH=$PATH:/usr/local/go/bin:$GOBIN' >> /etc/profile.d/envvar.sh
+echo "export http_proxy='$4'" >> /etc/profile.d/envvar.sh
+echo "export https_proxy='$5'" >> /etc/profile.d/envvar.sh
+echo "export no_proxy=192.168.2.10,192.168.2.11,127.0.0.1,localhost,netmaster" >> /etc/profile.d/envvar.sh
+echo "export CLUSTER_NODE_IPS=192.168.2.10,192.168.2.11" >> /etc/profile.d/envvar.sh
+echo "export USE_RELEASE=$6" >> /etc/profile.d/envvar.sh
+
+
+source /etc/profile.d/envvar.sh
+
+# setup docker cluster store
+cp #{gopath_folder}/src/github.com/contiv/netplugin/scripts/docker.service /lib/systemd/system/docker.service
+
+# setup docker remote api
+cp #{gopath_folder}/src/github.com/contiv/netplugin/scripts/docker-tcp.socket /etc/systemd/system/docker-tcp.socket
+systemctl enable docker-tcp.socket
+
+mkdir /etc/systemd/system/docker.service.d
+echo "[Service]" | sudo tee -a /etc/systemd/system/docker.service.d/http-proxy.conf
+echo "Environment=\\\"no_proxy=192.168.2.10,192.168.2.11,127.0.0.1,localhost,netmaster\\\" \\\"http_proxy=$http_proxy\\\" \\\"https_proxy=$https_proxy\\\"" | sudo tee -a /etc/systemd/system/docker.service.d/http-proxy.conf
+sudo systemctl daemon-reload
+sudo systemctl stop docker
+systemctl start docker-tcp.socket
+sudo systemctl start docker
+
+if [ $# -gt 6 ]; then
+    shift; shift; shift; shift; shift; shift
+    echo "export $@" >> /etc/profile.d/envvar.sh
+fi
+
+
+# remove duplicate docker key
+rm /etc/docker/key.json
+
+(service docker restart) || exit 1
+
+(ovs-vsctl set-manager tcp:127.0.0.1:6640 && \
+ ovs-vsctl set-manager ptcp:6640) || exit 1
+
+docker load --input #{gopath_folder}/src/github.com/contiv/netplugin/scripts/dnscontainer.tar
+SCRIPT
+
+VAGRANTFILE_API_VERSION = "2"
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+    config.vm.box = "contiv/centos71-netplugin"
+    config.vm.box_version = "0.3.1"
+
+    num_nodes = 2
+    if ENV['CONTIV_NODES'] && ENV['CONTIV_NODES'] != "" then
+        num_nodes = ENV['CONTIV_NODES'].to_i
+    end
+    base_ip = "192.168.33."
+    node_ips = num_nodes.times.collect { |n| base_ip + "#{n+10}" }
+    node_names = num_nodes.times.collect { |n| "node#{n+1}" }
+    node_peers = []
+
+    num_nodes.times do |n|
+        node_name = node_names[n]
+        node_addr = node_ips[n]
+        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|
+            # node.vm.hostname = node_name
+            # create an interface for etcd cluster
+            node.vm.network :private_network, ip: node_addr, virtualbox__intnet: "true", auto_config: false
+            # create an interface for bridged network
+            node.vm.network :private_network, ip: "0.0.0.0", virtualbox__intnet: "true", auto_config: false
+            node.vm.provider "virtualbox" do |v|
+                # make all nics 'virtio' to take benefit of builtin vlan tag
+                # support, which otherwise needs to be enabled in Intel drivers,
+                # which are used by default by virtualbox
+                v.customize ['modifyvm', :id, '--nictype1', 'virtio']
+                v.customize ['modifyvm', :id, '--nictype2', 'virtio']
+                v.customize ['modifyvm', :id, '--nictype3', 'virtio']
+                v.customize ['modifyvm', :id, '--nicpromisc2', 'allow-all']
+                v.customize ['modifyvm', :id, '--nicpromisc3', 'allow-all']
+                v.customize ['modifyvm', :id, '--paravirtprovider', "kvm"]
+            end
+
+            # mount the host directories
+            node.vm.synced_folder "../../bin", File.join(gopath_folder, "bin")
+            if ENV["GOPATH"] && ENV['GOPATH'] != ""
+              node.vm.synced_folder "../../../../../", File.join(gopath_folder, "src"), rsync: true
+            else
+              node.vm.synced_folder "../../", File.join(gopath_folder, "src/github.com/contiv/netplugin"), rsync: true
+            end
+
+            node.vm.provision "shell" do |s|
+                s.inline = "echo '#{node_ips[0]} netmaster' >> /etc/hosts; echo '#{node_addr} #{node_name}' >> /etc/hosts"
+            end
+            node.vm.provision "shell" do |s|
+                s.inline = provision_common
+                s.args = [node_name, ENV["CONTIV_NODE_OS"] || "", node_addr, ENV["http_proxy"] || "", ENV["https_proxy"] || "", ENV["USE_RELEASE"] || "", *ENV['CONTIV_ENV']]
+            end
+provision_node = <<SCRIPT
+## start etcd with generated config
+set -x
+(nohup etcd --name #{node_name} --data-dir /tmp/etcd \
+ --listen-client-urls http://0.0.0.0:2379,http://0.0.0.0:4001 \
+ --advertise-client-urls http://#{node_addr}:2379,http://#{node_addr}:4001 \
+ --initial-advertise-peer-urls http://#{node_addr}:2380,http://#{node_addr}:7001 \
+ --listen-peer-urls http://#{node_addr}:2380 \
+ --initial-cluster #{node_peers.join(",")} --initial-cluster-state new \
+  0<&- &>/tmp/etcd.log &) || exit 1
+
+## start consul
+(nohup consul agent -server #{consul_join_flag} #{consul_bootstrap_flag} \
+ -bind=#{node_addr} -data-dir /opt/consul 0<&- &>/tmp/consul.log &) || exit 1
+
+SCRIPT
+            node.vm.provision "shell", run: "always" do |s|
+                s.inline = provision_node
+            end
+
+            if n == (num_nodes - 1) then
+              node.vm.provision "ansible" do |ansible|
+                  ansible.playbook = "playbook.yml"
+                  ansible.groups = ANSIBLE_GROUPS
+                  ansible.limit = "all"
+              end
+            end
+            # forward netmaster port
+            if n == 0 then
+                node.vm.network "forwarded_port", guest: 5050, host: 5050
+                node.vm.network "forwarded_port", guest: 8080, host: 8080
+                node.vm.network "forwarded_port", guest: 9999, host: 9090
+            end
+        end
+    end
+end
diff --git a/mgmtfn/mesos-docker/docker.json b/mgmtfn/mesos-docker/docker.json
new file mode 100644
index 000000000..abec94155
--- /dev/null
+++ b/mgmtfn/mesos-docker/docker.json
@@ -0,0 +1,18 @@
+{
+  "container": {
+    "type": "DOCKER",
+    "docker": {
+      "image": "libmesos/ubuntu",
+      "parameters": [
+                { "key": "net", "value": "contiv" }
+      ]
+    }
+  },
+  "id": "ubuntu",
+  "instances": 2,
+  "constraints": [ ["hostname", "UNIQUE", ""] ],
+  "cpus": 1,
+  "mem": 128,
+  "uris": [],
+  "cmd": "while sleep 10; do date -u +%T; done"
+}
diff --git a/mgmtfn/mesos-docker/launch.sh b/mgmtfn/mesos-docker/launch.sh
new file mode 100755
index 000000000..ba02f82de
--- /dev/null
+++ b/mgmtfn/mesos-docker/launch.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# Launch a marathon job
+
+USAGE="Usage: $0 <marathon-json-file>"
+
+if [ $# -ne 1 ]; then
+    echo $USAGE
+    exit 1
+fi
+
+curl -X POST -H "Content-Type: application/json" http://localhost:8080/v2/apps -d@$1
diff --git a/mgmtfn/mesos-docker/playbook.yml b/mgmtfn/mesos-docker/playbook.yml
new file mode 100644
index 000000000..e065c2485
--- /dev/null
+++ b/mgmtfn/mesos-docker/playbook.yml
@@ -0,0 +1,54 @@
+---
+- hosts: master
+  remote_user: vagrant
+  become: yes
+  become_method: sudo
+  tasks:
+#      - name: upgrade system (redhat)
+#        yum:
+#          update_cache: true
+#          name: '*'
+#          state: latest
+      - name: install mesosphere yum repo
+        yum: name=http://repos.mesosphere.com/el/7/noarch/RPMS/mesosphere-el-repo-7-1.noarch.rpm state=present
+      - name: install zookeeper yum repo
+        yum: name=http://archive.cloudera.com/cdh4/one-click-install/redhat/6/x86_64/cloudera-cdh-4-0.x86_64.rpm state=present
+      - name: install zookeeper
+        yum: pkg=zookeeper,zookeeper-server state=latest
+      - name: configure zookeeper ID
+        become_user: zookeeper
+        shell: zookeeper-server-initialize --force --myid=1
+      - name: install mesos and marathon packages
+        yum: pkg=device-mapper-event-libs,mesos-0.27.0,marathon-0.14.0 state=latest
+      - name: configure containerizers
+        lineinfile: dest=/etc/mesos-slave/containerizers create=yes line="docker,mesos"
+      - name: start zookeeper
+        service: name=zookeeper-server state=started enabled=yes
+      - name: start mesos-master
+        service: name=mesos-master state=started enabled=yes
+      - name: start mesos-slave
+        service: name=mesos-slave state=started enabled=yes
+      - name: start marathon
+        service: name=marathon state=started enabled=yes
+
+
+- hosts: nodes
+  remote_user: vagrant
+  become: yes
+  become_method: sudo
+  tasks:
+#      - name: upgrade system (redhat)
+#        yum:
+#          update_cache: true
+#          name: '*'
+#          state: latest
+      - name: install mesosphere yum repo
+        yum: name=http://repos.mesosphere.com/el/7/noarch/RPMS/mesosphere-el-repo-7-1.noarch.rpm state=present
+      - name: install mesos packages
+        yum: pkg=device-mapper-event-libs,mesos-0.27.0 state=latest
+      - name: configure containerizers
+        lineinfile: dest=/etc/mesos-slave/containerizers create=yes line="docker,mesos"
+      - name: set zookeeper master
+        replace: dest=/etc/mesos/zk regexp="localhost" replace="192.168.33.10"
+      - name: start mesos-slave
+        service: name=mesos-slave state=started enabled=yes
diff --git a/mgmtfn/mesos-docker/startPlugin.sh b/mgmtfn/mesos-docker/startPlugin.sh
new file mode 100755
index 000000000..56293f5eb
--- /dev/null
+++ b/mgmtfn/mesos-docker/startPlugin.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+# Start netplugin on this setup
+
+../../scripts/python/startPlugin.py -nodes 192.168.33.10,192.168.33.11
+
+# Create a network to launch docker containers
+netctl net create contiv -s 10.1.1.0/24

From a9056093dae0ed180c5ab6a0c84b3c7004ab498b Mon Sep 17 00:00:00 2001
From: Sukhesh Halemane <shaleman@cisco.com>
Date: Mon, 28 Mar 2016 11:33:33 -0700
Subject: [PATCH 2/3] Move mesos and k8s vagrant files to demo directory

---
 Makefile                                      |  30 ++--
 .../vagrant => demo/k8s}/Vagrantfile          |   0
 .../vagrant => demo/k8s}/cluster_defs.json    |   0
 .../vagrant => demo/k8s}/copy_demo.sh         |   0
 .../k8s}/export/defaultnet-busybox1.yaml      |   0
 .../k8s}/export/defaultnet-busybox2.yaml      |   0
 .../export/nc-busybox/Dockerfile.nc-busybox   |   0
 .../k8s}/export/nc-busybox/nc_loop.sh         |   0
 .../k8s}/export/noping-busybox.yaml           |   0
 .../k8s}/export/pingme-busybox.yaml           |   0
 .../k8s}/export/pocnet-busybox.yaml           |   0
 .../vagrant => demo/k8s}/export/policy.sh     |   0
 .../vagrant => demo/k8s}/restart_cluster.sh   |   0
 .../vagrant => demo/k8s}/setup_cluster.sh     |   0
 .../vagrant => demo/k8s}/vagrant_cluster.py   |   0
 demo/mesos-docker/README.md                   |  78 ++++++++
 demo/mesos-docker/Vagrantfile                 | 169 ++++++++++++++++++
 demo/mesos-docker/docker.json                 |  18 ++
 demo/mesos-docker/launch.sh                   |  12 ++
 demo/mesos-docker/playbook.yml                |  54 ++++++
 demo/mesos-docker/startPlugin.sh              |   7 +
 21 files changed, 356 insertions(+), 12 deletions(-)
 rename {mgmtfn/k8splugin/contivk8s/vagrant => demo/k8s}/Vagrantfile (100%)
 rename {mgmtfn/k8splugin/contivk8s/vagrant => demo/k8s}/cluster_defs.json (100%)
 rename {mgmtfn/k8splugin/contivk8s/vagrant => demo/k8s}/copy_demo.sh (100%)
 rename {mgmtfn/k8splugin/contivk8s/vagrant => demo/k8s}/export/defaultnet-busybox1.yaml (100%)
 rename {mgmtfn/k8splugin/contivk8s/vagrant => demo/k8s}/export/defaultnet-busybox2.yaml (100%)
 rename {mgmtfn/k8splugin/contivk8s/vagrant => demo/k8s}/export/nc-busybox/Dockerfile.nc-busybox (100%)
 rename {mgmtfn/k8splugin/contivk8s/vagrant => demo/k8s}/export/nc-busybox/nc_loop.sh (100%)
 rename {mgmtfn/k8splugin/contivk8s/vagrant => demo/k8s}/export/noping-busybox.yaml (100%)
 rename {mgmtfn/k8splugin/contivk8s/vagrant => demo/k8s}/export/pingme-busybox.yaml (100%)
 rename {mgmtfn/k8splugin/contivk8s/vagrant => demo/k8s}/export/pocnet-busybox.yaml (100%)
 rename {mgmtfn/k8splugin/contivk8s/vagrant => demo/k8s}/export/policy.sh (100%)
 rename {mgmtfn/k8splugin/contivk8s/vagrant => demo/k8s}/restart_cluster.sh (100%)
 rename {mgmtfn/k8splugin/contivk8s/vagrant => demo/k8s}/setup_cluster.sh (100%)
 rename {mgmtfn/k8splugin/contivk8s/vagrant => demo/k8s}/vagrant_cluster.py (100%)
 create mode 100644 demo/mesos-docker/README.md
 create mode 100644 demo/mesos-docker/Vagrantfile
 create mode 100644 demo/mesos-docker/docker.json
 create mode 100755 demo/mesos-docker/launch.sh
 create mode 100644 demo/mesos-docker/playbook.yml
 create mode 100755 demo/mesos-docker/startPlugin.sh

diff --git a/Makefile b/Makefile
index 66ecc5da8..86bb56bc1 100755
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,8 @@
 
 # find all verifiable packages.
 # XXX: explore a better way that doesn't need multiple 'find'
-PKGS := `find . -mindepth 1 -maxdepth 1 -type d -name '*' | grep -vE '/\..*$\|Godeps|examples|docs|scripts|mgmtfn|bin|contrib'`
-PKGS += `find . -mindepth 2 -maxdepth 2 -type d -name '*'| grep -vE '/\..*$\|Godeps|examples|docs|scripts|bin|contrib'`
+PKGS := `find . -mindepth 1 -maxdepth 1 -type d -name '*' | grep -vE '/\..*$\|Godeps|examples|docs|scripts|mgmtfn|bin|contrib|demo'`
+PKGS += `find . -mindepth 2 -maxdepth 2 -type d -name '*'| grep -vE '/\..*$\|Godeps|examples|docs|scripts|bin|contrib|demo'`
 TO_BUILD := ./netplugin/ ./netmaster/ ./netctl/netctl/ ./mgmtfn/k8splugin/contivk8s/
 HOST_GOBIN := `if [ -n "$$(go env GOBIN)" ]; then go env GOBIN; else dirname $$(which go); fi`
 HOST_GOROOT := `go env GOROOT`
@@ -62,13 +62,23 @@ start: update
 
 #kubernetes demo targets
 k8s-cluster:
-	cd mgmtfn/k8splugin/contivk8s/vagrant && ./setup_cluster.sh
+	cd demo/k8s/ && ./setup_cluster.sh
 k8s-demo:
-	cd mgmtfn/k8splugin/contivk8s/vagrant && ./copy_demo.sh
+	cd demo/k8s/ && ./copy_demo.sh
 k8s-demo-start:
-	cd mgmtfn/k8splugin/contivk8s/vagrant && ./restart_cluster.sh && vagrant ssh k8master
+	cd demo/k8s/ && ./restart_cluster.sh && vagrant ssh k8master
 k8s-destroy:
-	cd mgmtfn/k8splugin/contivk8s/vagrant && vagrant destroy -f
+	cd demo/k8s/ && vagrant destroy -f
+
+# Mesos demo targets
+mesos-docker-demo:
+	cd demo/mesos-docker && vagrant up
+	cd demo/mesos-docker && vagrant ssh node1 -c 'sudo -i bash -lc "source /etc/profile.d/envvar.sh && cd /opt/gopath/src/github.com/contiv/netplugin && make run-build"'
+	cd demo/mesos-docker && vagrant ssh node1 -c 'sudo -i bash -lc "source /etc/profile.d/envvar.sh && cd /opt/gopath/src/github.com/contiv/netplugin && ./scripts/python/startPlugin.py -nodes 192.168.33.10,192.168.33.11"'
+
+mesos-docker-destroy:
+	cd demo/mesos-docker && vagrant destroy -f
+
 
 demo-centos:
 	CONTIV_NODE_OS=centos make demo
@@ -79,11 +89,7 @@ stop:
 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 -plugin-mode docker -vlan-if eth2 2>&1> /tmp/netplugin.log &"'
-	vagrant ssh netplugin-node2 -c 'nohup bash -lc "sudo /opt/gopath/bin/netplugin -plugin-mode docker -vlan-if eth2 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
+	vagrant ssh netplugin-node1 -c 'sudo -i bash -lc "source /etc/profile.d/envvar.sh && cd /opt/gopath/src/github.com/contiv/netplugin && make host-restart"'
 
 ssh:
 	@vagrant ssh netplugin-node1 -c 'bash -lc "cd /opt/gopath/src/github.com/contiv/netplugin/ && bash"' || echo 'Please run "make demo"'
@@ -129,7 +135,7 @@ host-restart:
 	@echo dev: restarting services...
 	cd $(GOPATH)/src/github.com/contiv/netplugin/scripts/python && PYTHONIOENCODING=utf-8 ./startPlugin.py -nodes ${CLUSTER_NODE_IPS}
 
-only-tar: 
+only-tar:
 
 tar: clean-tar build
 	@cat ${GOPATH}/src/github.com/contiv/netplugin/version/version_gen.go | grep versionStr | cut -f 4 -d " " | tr -d \" > $(VERSION_FILE)
diff --git a/mgmtfn/k8splugin/contivk8s/vagrant/Vagrantfile b/demo/k8s/Vagrantfile
similarity index 100%
rename from mgmtfn/k8splugin/contivk8s/vagrant/Vagrantfile
rename to demo/k8s/Vagrantfile
diff --git a/mgmtfn/k8splugin/contivk8s/vagrant/cluster_defs.json b/demo/k8s/cluster_defs.json
similarity index 100%
rename from mgmtfn/k8splugin/contivk8s/vagrant/cluster_defs.json
rename to demo/k8s/cluster_defs.json
diff --git a/mgmtfn/k8splugin/contivk8s/vagrant/copy_demo.sh b/demo/k8s/copy_demo.sh
similarity index 100%
rename from mgmtfn/k8splugin/contivk8s/vagrant/copy_demo.sh
rename to demo/k8s/copy_demo.sh
diff --git a/mgmtfn/k8splugin/contivk8s/vagrant/export/defaultnet-busybox1.yaml b/demo/k8s/export/defaultnet-busybox1.yaml
similarity index 100%
rename from mgmtfn/k8splugin/contivk8s/vagrant/export/defaultnet-busybox1.yaml
rename to demo/k8s/export/defaultnet-busybox1.yaml
diff --git a/mgmtfn/k8splugin/contivk8s/vagrant/export/defaultnet-busybox2.yaml b/demo/k8s/export/defaultnet-busybox2.yaml
similarity index 100%
rename from mgmtfn/k8splugin/contivk8s/vagrant/export/defaultnet-busybox2.yaml
rename to demo/k8s/export/defaultnet-busybox2.yaml
diff --git a/mgmtfn/k8splugin/contivk8s/vagrant/export/nc-busybox/Dockerfile.nc-busybox b/demo/k8s/export/nc-busybox/Dockerfile.nc-busybox
similarity index 100%
rename from mgmtfn/k8splugin/contivk8s/vagrant/export/nc-busybox/Dockerfile.nc-busybox
rename to demo/k8s/export/nc-busybox/Dockerfile.nc-busybox
diff --git a/mgmtfn/k8splugin/contivk8s/vagrant/export/nc-busybox/nc_loop.sh b/demo/k8s/export/nc-busybox/nc_loop.sh
similarity index 100%
rename from mgmtfn/k8splugin/contivk8s/vagrant/export/nc-busybox/nc_loop.sh
rename to demo/k8s/export/nc-busybox/nc_loop.sh
diff --git a/mgmtfn/k8splugin/contivk8s/vagrant/export/noping-busybox.yaml b/demo/k8s/export/noping-busybox.yaml
similarity index 100%
rename from mgmtfn/k8splugin/contivk8s/vagrant/export/noping-busybox.yaml
rename to demo/k8s/export/noping-busybox.yaml
diff --git a/mgmtfn/k8splugin/contivk8s/vagrant/export/pingme-busybox.yaml b/demo/k8s/export/pingme-busybox.yaml
similarity index 100%
rename from mgmtfn/k8splugin/contivk8s/vagrant/export/pingme-busybox.yaml
rename to demo/k8s/export/pingme-busybox.yaml
diff --git a/mgmtfn/k8splugin/contivk8s/vagrant/export/pocnet-busybox.yaml b/demo/k8s/export/pocnet-busybox.yaml
similarity index 100%
rename from mgmtfn/k8splugin/contivk8s/vagrant/export/pocnet-busybox.yaml
rename to demo/k8s/export/pocnet-busybox.yaml
diff --git a/mgmtfn/k8splugin/contivk8s/vagrant/export/policy.sh b/demo/k8s/export/policy.sh
similarity index 100%
rename from mgmtfn/k8splugin/contivk8s/vagrant/export/policy.sh
rename to demo/k8s/export/policy.sh
diff --git a/mgmtfn/k8splugin/contivk8s/vagrant/restart_cluster.sh b/demo/k8s/restart_cluster.sh
similarity index 100%
rename from mgmtfn/k8splugin/contivk8s/vagrant/restart_cluster.sh
rename to demo/k8s/restart_cluster.sh
diff --git a/mgmtfn/k8splugin/contivk8s/vagrant/setup_cluster.sh b/demo/k8s/setup_cluster.sh
similarity index 100%
rename from mgmtfn/k8splugin/contivk8s/vagrant/setup_cluster.sh
rename to demo/k8s/setup_cluster.sh
diff --git a/mgmtfn/k8splugin/contivk8s/vagrant/vagrant_cluster.py b/demo/k8s/vagrant_cluster.py
similarity index 100%
rename from mgmtfn/k8splugin/contivk8s/vagrant/vagrant_cluster.py
rename to demo/k8s/vagrant_cluster.py
diff --git a/demo/mesos-docker/README.md b/demo/mesos-docker/README.md
new file mode 100644
index 000000000..a9b138115
--- /dev/null
+++ b/demo/mesos-docker/README.md
@@ -0,0 +1,78 @@
+# Netplugin with Mesos Marathon
+
+This document explains how to use Netplugin with Mesos Marathon. Currently, netplugin supports docker containerizer with Mesos Marathon.
+
+## Getting started with Vagrant VMs
+### Prerequisits
+- Virtualbox 5.0.2 or higher
+- Vagrant 1.7.4 or higher
+- ansible 1.9.4 or higher
+
+### Step 1: Bring up the vagrant VMs
+
+```
+$ git clone https://github.com/contiv/netplugin
+$ cd netplugin
+$ make mesos-docker-demo
+```
+
+This will bring up a two node Vagrant setup with Mesos, Marathon and docker.
+Bringing up vagrant VMs and provisioning them can take few minutes to complete since it needs to download the VM images and mesos/marathon binaries. Please be patient.
+This will also build netplugin binaries and start them on both VMs
+
+
+### Step 2: Login to a VM and Create a network
+
+```
+$ cd demo/mesos-docker; vagrant ssh node1
+<Inside vagrant VM>
+$ netctl net create contiv -subnet 10.1.1.0/24
+```
+
+This will create a network called `contiv`. Containers can be launched in this network.
+
+### Step 3: Launch containers
+
+`docker.json` file in mgmtfn/mesos-docker directory has an example marathon app definition.
+
+```
+
+  "container": {
+    "type": "DOCKER",
+    "docker": {
+      "image": "libmesos/ubuntu",
+      "parameters": [ { "key": "net", "value": "contiv" } ]
+    }
+  },
+  "id": "ubuntu",
+  "instances": 2,
+  "constraints": [ ["hostname", "UNIQUE", ""] ],
+  "cpus": 1,
+  "mem": 128,
+  "uris": [],
+  "cmd": "while sleep 10; do date -u +%T; done"
+}
+```
+
+This example application definition launches two ubuntu containers with a constraint that both containers be spread on different hosts.
+Note that there is a special `net` parameter used in this specification `"parameters": [ { "key": "net", "value": "contiv" } ]`. This tells docker to launch the application in contiv network that we created in step 3.
+
+You can launch this application using following command
+
+```
+$ ./launch.sh docker.json
+```
+
+Launching the container can take few minutes depending on how long it takes to pull the image.
+Once its launched, you should be able to see the containers using docker commands
+
+```
+$ docker ps
+CONTAINER ID        IMAGE               COMMAND                  CREATED             STATUS              PORTS               NAMES
+2a68fed77d5a        libmesos/ubuntu     "/bin/sh -c 'while sl"   About an hour ago   Up About an hour                       mesos-cce1c91f-65fb-457d-99af-5fdd4af14f16-S1.da634e3c-1fde-479a-b100-c61a498bcbe7
+ ```
+
+## Notes
+
+ 1. Mesos and Marathon ports are port-mapped from vagrant VM to host machine. You can access them by logging into localhost:5050 and localhost:8080 respectively.
+ 2. Netmaster web-ui is port-mapped to port 9090 on the host machine
diff --git a/demo/mesos-docker/Vagrantfile b/demo/mesos-docker/Vagrantfile
new file mode 100644
index 000000000..7bb0b501b
--- /dev/null
+++ b/demo/mesos-docker/Vagrantfile
@@ -0,0 +1,169 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+require 'fileutils'
+
+# netplugin_synced_gopath="/opt/golang"
+gopath_folder="/opt/gopath"
+
+ANSIBLE_GROUPS = {
+              "master" => ["node1"],
+              "nodes" => ["node2"],
+              "all_groups:children" => ["master, ""nodes"]
+            }
+
+provision_common = <<SCRIPT
+## setup the environment file. Export the env-vars passed as args to 'vagrant up'
+echo Args passed: [[ $@ ]]
+
+echo -n "$1" > /etc/hostname
+hostname -F /etc/hostname
+
+/sbin/ip addr add "$3/24" dev eth1
+/sbin/ip link set eth1 up
+/sbin/ip link set eth2 up
+
+echo 'export GOPATH=#{gopath_folder}' > /etc/profile.d/envvar.sh
+echo 'export GOBIN=$GOPATH/bin' >> /etc/profile.d/envvar.sh
+echo 'export GOSRC=$GOPATH/src' >> /etc/profile.d/envvar.sh
+echo 'export PATH=$PATH:/usr/local/go/bin:$GOBIN' >> /etc/profile.d/envvar.sh
+echo "export http_proxy='$4'" >> /etc/profile.d/envvar.sh
+echo "export https_proxy='$5'" >> /etc/profile.d/envvar.sh
+echo "export no_proxy=192.168.2.10,192.168.2.11,127.0.0.1,localhost,netmaster" >> /etc/profile.d/envvar.sh
+echo "export CLUSTER_NODE_IPS=192.168.2.10,192.168.2.11" >> /etc/profile.d/envvar.sh
+echo "export USE_RELEASE=$6" >> /etc/profile.d/envvar.sh
+
+
+source /etc/profile.d/envvar.sh
+
+# setup docker cluster store
+cp #{gopath_folder}/src/github.com/contiv/netplugin/scripts/docker.service /lib/systemd/system/docker.service
+
+# setup docker remote api
+cp #{gopath_folder}/src/github.com/contiv/netplugin/scripts/docker-tcp.socket /etc/systemd/system/docker-tcp.socket
+systemctl enable docker-tcp.socket
+
+mkdir /etc/systemd/system/docker.service.d
+echo "[Service]" | sudo tee -a /etc/systemd/system/docker.service.d/http-proxy.conf
+echo "Environment=\\\"no_proxy=192.168.2.10,192.168.2.11,127.0.0.1,localhost,netmaster\\\" \\\"http_proxy=$http_proxy\\\" \\\"https_proxy=$https_proxy\\\"" | sudo tee -a /etc/systemd/system/docker.service.d/http-proxy.conf
+sudo systemctl daemon-reload
+sudo systemctl stop docker
+systemctl start docker-tcp.socket
+sudo systemctl start docker
+
+if [ $# -gt 6 ]; then
+    shift; shift; shift; shift; shift; shift
+    echo "export $@" >> /etc/profile.d/envvar.sh
+fi
+
+
+# remove duplicate docker key
+rm /etc/docker/key.json
+
+(service docker restart) || exit 1
+
+(ovs-vsctl set-manager tcp:127.0.0.1:6640 && \
+ ovs-vsctl set-manager ptcp:6640) || exit 1
+
+docker load --input #{gopath_folder}/src/github.com/contiv/netplugin/scripts/dnscontainer.tar
+SCRIPT
+
+VAGRANTFILE_API_VERSION = "2"
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+    config.vm.box = "contiv/centos71-netplugin"
+    config.vm.box_version = "0.3.1"
+
+    num_nodes = 2
+    if ENV['CONTIV_NODES'] && ENV['CONTIV_NODES'] != "" then
+        num_nodes = ENV['CONTIV_NODES'].to_i
+    end
+    base_ip = "192.168.33."
+    node_ips = num_nodes.times.collect { |n| base_ip + "#{n+10}" }
+    node_names = num_nodes.times.collect { |n| "node#{n+1}" }
+    node_peers = []
+
+    num_nodes.times do |n|
+        node_name = node_names[n]
+        node_addr = node_ips[n]
+        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|
+            # node.vm.hostname = node_name
+            # create an interface for etcd cluster
+            node.vm.network :private_network, ip: node_addr, virtualbox__intnet: "true", auto_config: false
+            # create an interface for bridged network
+            node.vm.network :private_network, ip: "0.0.0.0", virtualbox__intnet: "true", auto_config: false
+            node.vm.provider "virtualbox" do |v|
+                # make all nics 'virtio' to take benefit of builtin vlan tag
+                # support, which otherwise needs to be enabled in Intel drivers,
+                # which are used by default by virtualbox
+                v.customize ['modifyvm', :id, '--nictype1', 'virtio']
+                v.customize ['modifyvm', :id, '--nictype2', 'virtio']
+                v.customize ['modifyvm', :id, '--nictype3', 'virtio']
+                v.customize ['modifyvm', :id, '--nicpromisc2', 'allow-all']
+                v.customize ['modifyvm', :id, '--nicpromisc3', 'allow-all']
+                v.customize ['modifyvm', :id, '--paravirtprovider', "kvm"]
+            end
+
+            # mount the host directories
+            node.vm.synced_folder "../../bin", File.join(gopath_folder, "bin")
+            if ENV["GOPATH"] && ENV['GOPATH'] != ""
+              node.vm.synced_folder "../../../../../", File.join(gopath_folder, "src"), rsync: true
+            else
+              node.vm.synced_folder "../../", File.join(gopath_folder, "src/github.com/contiv/netplugin"), rsync: true
+            end
+
+            node.vm.provision "shell" do |s|
+                s.inline = "echo '#{node_ips[0]} netmaster' >> /etc/hosts; echo '#{node_addr} #{node_name}' >> /etc/hosts"
+            end
+            node.vm.provision "shell" do |s|
+                s.inline = provision_common
+                s.args = [node_name, ENV["CONTIV_NODE_OS"] || "", node_addr, ENV["http_proxy"] || "", ENV["https_proxy"] || "", ENV["USE_RELEASE"] || "", *ENV['CONTIV_ENV']]
+            end
+provision_node = <<SCRIPT
+## start etcd with generated config
+set -x
+(nohup etcd --name #{node_name} --data-dir /tmp/etcd \
+ --listen-client-urls http://0.0.0.0:2379,http://0.0.0.0:4001 \
+ --advertise-client-urls http://#{node_addr}:2379,http://#{node_addr}:4001 \
+ --initial-advertise-peer-urls http://#{node_addr}:2380,http://#{node_addr}:7001 \
+ --listen-peer-urls http://#{node_addr}:2380 \
+ --initial-cluster #{node_peers.join(",")} --initial-cluster-state new \
+  0<&- &>/tmp/etcd.log &) || exit 1
+
+## start consul
+(nohup consul agent -server #{consul_join_flag} #{consul_bootstrap_flag} \
+ -bind=#{node_addr} -data-dir /opt/consul 0<&- &>/tmp/consul.log &) || exit 1
+
+SCRIPT
+            node.vm.provision "shell", run: "always" do |s|
+                s.inline = provision_node
+            end
+
+            if n == (num_nodes - 1) then
+              node.vm.provision "ansible" do |ansible|
+                  ansible.playbook = "playbook.yml"
+                  ansible.groups = ANSIBLE_GROUPS
+                  ansible.limit = "all"
+              end
+            end
+            # forward netmaster port
+            if n == 0 then
+                node.vm.network "forwarded_port", guest: 5050, host: 5050
+                node.vm.network "forwarded_port", guest: 8080, host: 8080
+                node.vm.network "forwarded_port", guest: 9999, host: 9090
+            end
+        end
+    end
+end
diff --git a/demo/mesos-docker/docker.json b/demo/mesos-docker/docker.json
new file mode 100644
index 000000000..abec94155
--- /dev/null
+++ b/demo/mesos-docker/docker.json
@@ -0,0 +1,18 @@
+{
+  "container": {
+    "type": "DOCKER",
+    "docker": {
+      "image": "libmesos/ubuntu",
+      "parameters": [
+                { "key": "net", "value": "contiv" }
+      ]
+    }
+  },
+  "id": "ubuntu",
+  "instances": 2,
+  "constraints": [ ["hostname", "UNIQUE", ""] ],
+  "cpus": 1,
+  "mem": 128,
+  "uris": [],
+  "cmd": "while sleep 10; do date -u +%T; done"
+}
diff --git a/demo/mesos-docker/launch.sh b/demo/mesos-docker/launch.sh
new file mode 100755
index 000000000..ba02f82de
--- /dev/null
+++ b/demo/mesos-docker/launch.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# Launch a marathon job
+
+USAGE="Usage: $0 <marathon-json-file>"
+
+if [ $# -ne 1 ]; then
+    echo $USAGE
+    exit 1
+fi
+
+curl -X POST -H "Content-Type: application/json" http://localhost:8080/v2/apps -d@$1
diff --git a/demo/mesos-docker/playbook.yml b/demo/mesos-docker/playbook.yml
new file mode 100644
index 000000000..e065c2485
--- /dev/null
+++ b/demo/mesos-docker/playbook.yml
@@ -0,0 +1,54 @@
+---
+- hosts: master
+  remote_user: vagrant
+  become: yes
+  become_method: sudo
+  tasks:
+#      - name: upgrade system (redhat)
+#        yum:
+#          update_cache: true
+#          name: '*'
+#          state: latest
+      - name: install mesosphere yum repo
+        yum: name=http://repos.mesosphere.com/el/7/noarch/RPMS/mesosphere-el-repo-7-1.noarch.rpm state=present
+      - name: install zookeeper yum repo
+        yum: name=http://archive.cloudera.com/cdh4/one-click-install/redhat/6/x86_64/cloudera-cdh-4-0.x86_64.rpm state=present
+      - name: install zookeeper
+        yum: pkg=zookeeper,zookeeper-server state=latest
+      - name: configure zookeeper ID
+        become_user: zookeeper
+        shell: zookeeper-server-initialize --force --myid=1
+      - name: install mesos and marathon packages
+        yum: pkg=device-mapper-event-libs,mesos-0.27.0,marathon-0.14.0 state=latest
+      - name: configure containerizers
+        lineinfile: dest=/etc/mesos-slave/containerizers create=yes line="docker,mesos"
+      - name: start zookeeper
+        service: name=zookeeper-server state=started enabled=yes
+      - name: start mesos-master
+        service: name=mesos-master state=started enabled=yes
+      - name: start mesos-slave
+        service: name=mesos-slave state=started enabled=yes
+      - name: start marathon
+        service: name=marathon state=started enabled=yes
+
+
+- hosts: nodes
+  remote_user: vagrant
+  become: yes
+  become_method: sudo
+  tasks:
+#      - name: upgrade system (redhat)
+#        yum:
+#          update_cache: true
+#          name: '*'
+#          state: latest
+      - name: install mesosphere yum repo
+        yum: name=http://repos.mesosphere.com/el/7/noarch/RPMS/mesosphere-el-repo-7-1.noarch.rpm state=present
+      - name: install mesos packages
+        yum: pkg=device-mapper-event-libs,mesos-0.27.0 state=latest
+      - name: configure containerizers
+        lineinfile: dest=/etc/mesos-slave/containerizers create=yes line="docker,mesos"
+      - name: set zookeeper master
+        replace: dest=/etc/mesos/zk regexp="localhost" replace="192.168.33.10"
+      - name: start mesos-slave
+        service: name=mesos-slave state=started enabled=yes
diff --git a/demo/mesos-docker/startPlugin.sh b/demo/mesos-docker/startPlugin.sh
new file mode 100755
index 000000000..56293f5eb
--- /dev/null
+++ b/demo/mesos-docker/startPlugin.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+# Start netplugin on this setup
+
+../../scripts/python/startPlugin.py -nodes 192.168.33.10,192.168.33.11
+
+# Create a network to launch docker containers
+netctl net create contiv -s 10.1.1.0/24

From 681e8baf5997745c5b11a28917583058fe12f52f Mon Sep 17 00:00:00 2001
From: Sukhesh Halemane <shaleman@cisco.com>
Date: Mon, 28 Mar 2016 18:21:44 -0700
Subject: [PATCH 3/3] Move vagrant files; fix readme

Signed-off-by: Sukhesh Halemane <sukhesh_h@yahoo.com>
---
 Makefile                                      |   8 +-
 README.md                                     |   2 +-
 demo/k8s/copy_demo.sh                         |   2 +-
 demo/k8s/restart_cluster.sh                   |   2 +-
 demo/k8s/setup_cluster.sh                     |   4 +-
 demo/mesos-docker/Vagrantfile                 |  21 +++
 demo/mesos-docker/playbook.yml                |  12 +-
 mgmtfn/mesos-docker/README.md                 |  85 ---------
 mgmtfn/mesos-docker/Vagrantfile               | 169 ------------------
 mgmtfn/mesos-docker/docker.json               |  18 --
 mgmtfn/mesos-docker/launch.sh                 |  12 --
 mgmtfn/mesos-docker/playbook.yml              |  54 ------
 mgmtfn/mesos-docker/startPlugin.sh            |   7 -
 .../contrib}/completion/bash/netctl           |   0
 14 files changed, 32 insertions(+), 364 deletions(-)
 delete mode 100644 mgmtfn/mesos-docker/README.md
 delete mode 100644 mgmtfn/mesos-docker/Vagrantfile
 delete mode 100644 mgmtfn/mesos-docker/docker.json
 delete mode 100755 mgmtfn/mesos-docker/launch.sh
 delete mode 100644 mgmtfn/mesos-docker/playbook.yml
 delete mode 100755 mgmtfn/mesos-docker/startPlugin.sh
 rename {contrib => scripts/contrib}/completion/bash/netctl (100%)

diff --git a/Makefile b/Makefile
index 86bb56bc1..e4784a746 100755
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,8 @@
 
 # find all verifiable packages.
 # XXX: explore a better way that doesn't need multiple 'find'
-PKGS := `find . -mindepth 1 -maxdepth 1 -type d -name '*' | grep -vE '/\..*$\|Godeps|examples|docs|scripts|mgmtfn|bin|contrib|demo'`
-PKGS += `find . -mindepth 2 -maxdepth 2 -type d -name '*'| grep -vE '/\..*$\|Godeps|examples|docs|scripts|bin|contrib|demo'`
+PKGS := `find . -mindepth 1 -maxdepth 1 -type d -name '*' | grep -vE '/\..*$\|Godeps|examples|docs|scripts|mgmtfn|bin|demo'`
+PKGS += `find . -mindepth 2 -maxdepth 2 -type d -name '*'| grep -vE '/\..*$\|Godeps|examples|docs|scripts|bin|demo'`
 TO_BUILD := ./netplugin/ ./netmaster/ ./netctl/netctl/ ./mgmtfn/k8splugin/contivk8s/
 HOST_GOBIN := `if [ -n "$$(go env GOBIN)" ]; then go env GOBIN; else dirname $$(which go); fi`
 HOST_GOROOT := `go env GOROOT`
@@ -40,7 +40,7 @@ run-build: deps checks clean
 	cd ${GOPATH}/src/github.com/contiv/netplugin && version/generate_version ${USE_RELEASE} && \
 	cd $(GOPATH)/src/github.com/contiv/netplugin && \
 	godep go install -v $(TO_BUILD) && \
-	sudo cp contrib/completion/bash/netctl /etc/bash_completion.d/netctl
+	sudo cp scripts/contrib/completion/bash/netctl /etc/bash_completion.d/netctl
 
 build:
 	make start
@@ -139,7 +139,7 @@ only-tar:
 
 tar: clean-tar build
 	@cat ${GOPATH}/src/github.com/contiv/netplugin/version/version_gen.go | grep versionStr | cut -f 4 -d " " | tr -d \" > $(VERSION_FILE)
-	@tar -jcf $(TAR_FILE) -C $(GOPATH)/src/github.com/contiv/netplugin/bin netplugin netmaster netctl contivk8s -C $(GOPATH)/src/github.com/contiv/netplugin contrib/completion/bash/netctl
+	@tar -jcf $(TAR_FILE) -C $(GOPATH)/src/github.com/contiv/netplugin/bin netplugin netmaster netctl contivk8s -C $(GOPATH)/src/github.com/contiv/netplugin/scripts contrib/completion/bash/netctl
 
 clean-tar:
 	@rm -f $(TAR_LOC)/*.$(TAR_EXT)
diff --git a/README.md b/README.md
index 1b9cfbd7c..792cc5b98 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ $ vagrant ssh netplugin-node1
 #### Step 2: Create a network
 
 ```
-$ netctl net create contiv-net --subnet=20.1.1.0/24 --gateway=20.1.1.254 --pkt-tag=1001
+$ netctl net create contiv-net --subnet=20.1.1.0/24
 ```
 
 #### Step 3: Run your containers and enjoy the networking!
diff --git a/demo/k8s/copy_demo.sh b/demo/k8s/copy_demo.sh
index 4009bc4fc..7c7a645e4 100755
--- a/demo/k8s/copy_demo.sh
+++ b/demo/k8s/copy_demo.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
 # run ansible
-ansible-playbook -i .contiv_k8s_inventory ../../../../../contrib/ansible/cluster.yml --tags "contiv_demo" -e "networking=contiv"
+ansible-playbook -i .contiv_k8s_inventory ../../../contrib/ansible/cluster.yml --tags "contiv_demo" -e "networking=contiv"
diff --git a/demo/k8s/restart_cluster.sh b/demo/k8s/restart_cluster.sh
index 79b9afe22..857a88828 100755
--- a/demo/k8s/restart_cluster.sh
+++ b/demo/k8s/restart_cluster.sh
@@ -2,4 +2,4 @@
 
 top_dir=$(git rev-parse --show-toplevel | sed 's|/[^/]*$||')
 # run ansible
-ansible-playbook -i .contiv_k8s_inventory ../../../../../contrib/ansible/cluster.yml --tags "contiv_restart" -e "networking=contiv contiv_bin_path=$top_dir/contiv_bin"
+ansible-playbook -i .contiv_k8s_inventory ../../../contrib/ansible/cluster.yml --tags "contiv_restart" -e "networking=contiv contiv_bin_path=$top_dir/contiv_bin"
diff --git a/demo/k8s/setup_cluster.sh b/demo/k8s/setup_cluster.sh
index ded5156d2..310101c3e 100755
--- a/demo/k8s/setup_cluster.sh
+++ b/demo/k8s/setup_cluster.sh
@@ -11,7 +11,7 @@ function GetKubernetes {
     rm -rf $top_dir/k8s-$k8sVer/kubernetes
     rm -rf $top_dir/k8s-$k8sVer/bin
   else
-    cd $top_dir/k8s-$k8sVer 
+    cd $top_dir/k8s-$k8sVer
     wget https://github.com/kubernetes/kubernetes/releases/download/$k8sVer/kubernetes.tar.gz
   fi
 
@@ -76,4 +76,4 @@ vagrant up
 ./vagrant_cluster.py
 
 # run ansible
-ansible-playbook -i .contiv_k8s_inventory ../../../../../contrib/ansible/cluster.yml --skip-tags "contiv_restart,ovs_install" -e "networking=contiv localBuildOutput=$top_dir/k8s-$k8sVer/kubernetes/server/bin contiv_bin_path=$top_dir/contiv_bin"
+ansible-playbook -i .contiv_k8s_inventory ../../../contrib/ansible/cluster.yml --skip-tags "contiv_restart,ovs_install" -e "networking=contiv localBuildOutput=$top_dir/k8s-$k8sVer/kubernetes/server/bin contiv_bin_path=$top_dir/contiv_bin"
diff --git a/demo/mesos-docker/Vagrantfile b/demo/mesos-docker/Vagrantfile
index 7bb0b501b..4d85c4be4 100644
--- a/demo/mesos-docker/Vagrantfile
+++ b/demo/mesos-docker/Vagrantfile
@@ -6,6 +6,26 @@ require 'fileutils'
 # netplugin_synced_gopath="/opt/golang"
 gopath_folder="/opt/gopath"
 
+# Get env setting for http proxies
+host_env = { }
+host_env["no_proxy"] =  "192.168.2.10,192.168.2.11,127.0.0.1,localhost,netmaster"
+if ENV['CONTIV_ENV'] then
+    ENV['CONTIV_ENV'].split(" ").each do |env|
+        e = env.split("=")
+        host_env[e[0]]=e[1]
+    end
+end
+
+if ENV["http_proxy"]
+  host_env["HTTP_PROXY"]  = host_env["http_proxy"]  = ENV["http_proxy"]
+  host_env["HTTPS_PROXY"] = host_env["https_proxy"] = ENV["https_proxy"]
+end
+
+ansible_extra_vars = {
+    "env" => host_env,
+    "validate_certs" => "no",
+}
+
 ANSIBLE_GROUPS = {
               "master" => ["node1"],
               "nodes" => ["node2"],
@@ -156,6 +176,7 @@ SCRIPT
                   ansible.playbook = "playbook.yml"
                   ansible.groups = ANSIBLE_GROUPS
                   ansible.limit = "all"
+                  ansible.extra_vars = ansible_extra_vars
               end
             end
             # forward netmaster port
diff --git a/demo/mesos-docker/playbook.yml b/demo/mesos-docker/playbook.yml
index e065c2485..ce6a38397 100644
--- a/demo/mesos-docker/playbook.yml
+++ b/demo/mesos-docker/playbook.yml
@@ -3,12 +3,8 @@
   remote_user: vagrant
   become: yes
   become_method: sudo
+  environment: '{{ env }}'
   tasks:
-#      - name: upgrade system (redhat)
-#        yum:
-#          update_cache: true
-#          name: '*'
-#          state: latest
       - name: install mesosphere yum repo
         yum: name=http://repos.mesosphere.com/el/7/noarch/RPMS/mesosphere-el-repo-7-1.noarch.rpm state=present
       - name: install zookeeper yum repo
@@ -36,12 +32,8 @@
   remote_user: vagrant
   become: yes
   become_method: sudo
+  environment: '{{ env }}'
   tasks:
-#      - name: upgrade system (redhat)
-#        yum:
-#          update_cache: true
-#          name: '*'
-#          state: latest
       - name: install mesosphere yum repo
         yum: name=http://repos.mesosphere.com/el/7/noarch/RPMS/mesosphere-el-repo-7-1.noarch.rpm state=present
       - name: install mesos packages
diff --git a/mgmtfn/mesos-docker/README.md b/mgmtfn/mesos-docker/README.md
deleted file mode 100644
index 652ed14fb..000000000
--- a/mgmtfn/mesos-docker/README.md
+++ /dev/null
@@ -1,85 +0,0 @@
-# Netplugin with Mesos Marathon
-
-This document explains how to use Netplugin with Mesos Marathon. Currently, netplugin supports docker containerizer with Mesos Marathon.
-
-## Getting started with Vagrant VMs
-### Prerequisits
-- Virtualbox 5.0.2 or higher
-- Vagrant 1.7.4 or higher
-- ansible 1.9.4 or higher
-
-### Step 1: Bring up the vagrant VMs
-
-```
-$ git clone https://github.com/contiv/netplugin
-$ cd netplugin/mgmtfn/mesos-docker
-$ vagrant up
-```
-
-This will bring up a two node Vagrant setup with Mesos, Marathon and docker.
-Bringing up vagrant VMs and provisioning them can take few minutes to complete since it needs to download the VM images and mesos/marathon binaries. Please be patient.
-
-### Step 2: Build netplugin binaries
-
-```
-$ vagrant ssh node1
-< Inside the VM>
-$ cd /opt/gopath/src/github.com/contiv/netplugin
-$ make host-build
-```
-
-### Step 3: Start netplugin
-
-```
-$ cd mgmtfn/mesos-docker
-$ ./startPlugin.sh
-```
-
-This will start netplugin and netmaster processes on both VMs in the setup.
-This will also create a network called `contiv` to launch marathon containers
-
-### Step 4: Launch containers
-
-`docker.json` file in mgmtfn/mesos-docker directory has an example marathon app definition.
-
-```
-
-  "container": {
-    "type": "DOCKER",
-    "docker": {
-      "image": "libmesos/ubuntu",
-      "parameters": [ { "key": "net", "value": "contiv" } ]
-    }
-  },
-  "id": "ubuntu",
-  "instances": 2,
-  "constraints": [ ["hostname", "UNIQUE", ""] ],
-  "cpus": 1,
-  "mem": 128,
-  "uris": [],
-  "cmd": "while sleep 10; do date -u +%T; done"
-}
-```
-
-This example application definition launches two ubuntu containers with a constraint that both containers be spread on different hosts.
-Note that there is a special `net` parameter used in this specification `"parameters": [ { "key": "net", "value": "contiv" } ]`. This tells docker to launch the application in contiv network that we created in step 3.
-
-You can launch this application using following command
-
-```
-$ ./launch.sh docker.json
-```
-
-Launching the container can take few minutes depending on how long it takes to pull the image.
-Once its launched, you should be able to see the containers using docker commands
-
-```
-$ docker ps
-CONTAINER ID        IMAGE               COMMAND                  CREATED             STATUS              PORTS               NAMES
-2a68fed77d5a        libmesos/ubuntu     "/bin/sh -c 'while sl"   About an hour ago   Up About an hour                       mesos-cce1c91f-65fb-457d-99af-5fdd4af14f16-S1.da634e3c-1fde-479a-b100-c61a498bcbe7
- ```
-
-## Notes
-
- 1. Mesos and Marathon ports are port-mapped from vagrant VM to host machine. You can access them by logging into localhost:5050 and localhost:8080 respectively.
- 2. Netmaster web-ui is port-mapped to port 9090 on the host machine
diff --git a/mgmtfn/mesos-docker/Vagrantfile b/mgmtfn/mesos-docker/Vagrantfile
deleted file mode 100644
index 7bb0b501b..000000000
--- a/mgmtfn/mesos-docker/Vagrantfile
+++ /dev/null
@@ -1,169 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-require 'fileutils'
-
-# netplugin_synced_gopath="/opt/golang"
-gopath_folder="/opt/gopath"
-
-ANSIBLE_GROUPS = {
-              "master" => ["node1"],
-              "nodes" => ["node2"],
-              "all_groups:children" => ["master, ""nodes"]
-            }
-
-provision_common = <<SCRIPT
-## setup the environment file. Export the env-vars passed as args to 'vagrant up'
-echo Args passed: [[ $@ ]]
-
-echo -n "$1" > /etc/hostname
-hostname -F /etc/hostname
-
-/sbin/ip addr add "$3/24" dev eth1
-/sbin/ip link set eth1 up
-/sbin/ip link set eth2 up
-
-echo 'export GOPATH=#{gopath_folder}' > /etc/profile.d/envvar.sh
-echo 'export GOBIN=$GOPATH/bin' >> /etc/profile.d/envvar.sh
-echo 'export GOSRC=$GOPATH/src' >> /etc/profile.d/envvar.sh
-echo 'export PATH=$PATH:/usr/local/go/bin:$GOBIN' >> /etc/profile.d/envvar.sh
-echo "export http_proxy='$4'" >> /etc/profile.d/envvar.sh
-echo "export https_proxy='$5'" >> /etc/profile.d/envvar.sh
-echo "export no_proxy=192.168.2.10,192.168.2.11,127.0.0.1,localhost,netmaster" >> /etc/profile.d/envvar.sh
-echo "export CLUSTER_NODE_IPS=192.168.2.10,192.168.2.11" >> /etc/profile.d/envvar.sh
-echo "export USE_RELEASE=$6" >> /etc/profile.d/envvar.sh
-
-
-source /etc/profile.d/envvar.sh
-
-# setup docker cluster store
-cp #{gopath_folder}/src/github.com/contiv/netplugin/scripts/docker.service /lib/systemd/system/docker.service
-
-# setup docker remote api
-cp #{gopath_folder}/src/github.com/contiv/netplugin/scripts/docker-tcp.socket /etc/systemd/system/docker-tcp.socket
-systemctl enable docker-tcp.socket
-
-mkdir /etc/systemd/system/docker.service.d
-echo "[Service]" | sudo tee -a /etc/systemd/system/docker.service.d/http-proxy.conf
-echo "Environment=\\\"no_proxy=192.168.2.10,192.168.2.11,127.0.0.1,localhost,netmaster\\\" \\\"http_proxy=$http_proxy\\\" \\\"https_proxy=$https_proxy\\\"" | sudo tee -a /etc/systemd/system/docker.service.d/http-proxy.conf
-sudo systemctl daemon-reload
-sudo systemctl stop docker
-systemctl start docker-tcp.socket
-sudo systemctl start docker
-
-if [ $# -gt 6 ]; then
-    shift; shift; shift; shift; shift; shift
-    echo "export $@" >> /etc/profile.d/envvar.sh
-fi
-
-
-# remove duplicate docker key
-rm /etc/docker/key.json
-
-(service docker restart) || exit 1
-
-(ovs-vsctl set-manager tcp:127.0.0.1:6640 && \
- ovs-vsctl set-manager ptcp:6640) || exit 1
-
-docker load --input #{gopath_folder}/src/github.com/contiv/netplugin/scripts/dnscontainer.tar
-SCRIPT
-
-VAGRANTFILE_API_VERSION = "2"
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-    config.vm.box = "contiv/centos71-netplugin"
-    config.vm.box_version = "0.3.1"
-
-    num_nodes = 2
-    if ENV['CONTIV_NODES'] && ENV['CONTIV_NODES'] != "" then
-        num_nodes = ENV['CONTIV_NODES'].to_i
-    end
-    base_ip = "192.168.33."
-    node_ips = num_nodes.times.collect { |n| base_ip + "#{n+10}" }
-    node_names = num_nodes.times.collect { |n| "node#{n+1}" }
-    node_peers = []
-
-    num_nodes.times do |n|
-        node_name = node_names[n]
-        node_addr = node_ips[n]
-        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|
-            # node.vm.hostname = node_name
-            # create an interface for etcd cluster
-            node.vm.network :private_network, ip: node_addr, virtualbox__intnet: "true", auto_config: false
-            # create an interface for bridged network
-            node.vm.network :private_network, ip: "0.0.0.0", virtualbox__intnet: "true", auto_config: false
-            node.vm.provider "virtualbox" do |v|
-                # make all nics 'virtio' to take benefit of builtin vlan tag
-                # support, which otherwise needs to be enabled in Intel drivers,
-                # which are used by default by virtualbox
-                v.customize ['modifyvm', :id, '--nictype1', 'virtio']
-                v.customize ['modifyvm', :id, '--nictype2', 'virtio']
-                v.customize ['modifyvm', :id, '--nictype3', 'virtio']
-                v.customize ['modifyvm', :id, '--nicpromisc2', 'allow-all']
-                v.customize ['modifyvm', :id, '--nicpromisc3', 'allow-all']
-                v.customize ['modifyvm', :id, '--paravirtprovider', "kvm"]
-            end
-
-            # mount the host directories
-            node.vm.synced_folder "../../bin", File.join(gopath_folder, "bin")
-            if ENV["GOPATH"] && ENV['GOPATH'] != ""
-              node.vm.synced_folder "../../../../../", File.join(gopath_folder, "src"), rsync: true
-            else
-              node.vm.synced_folder "../../", File.join(gopath_folder, "src/github.com/contiv/netplugin"), rsync: true
-            end
-
-            node.vm.provision "shell" do |s|
-                s.inline = "echo '#{node_ips[0]} netmaster' >> /etc/hosts; echo '#{node_addr} #{node_name}' >> /etc/hosts"
-            end
-            node.vm.provision "shell" do |s|
-                s.inline = provision_common
-                s.args = [node_name, ENV["CONTIV_NODE_OS"] || "", node_addr, ENV["http_proxy"] || "", ENV["https_proxy"] || "", ENV["USE_RELEASE"] || "", *ENV['CONTIV_ENV']]
-            end
-provision_node = <<SCRIPT
-## start etcd with generated config
-set -x
-(nohup etcd --name #{node_name} --data-dir /tmp/etcd \
- --listen-client-urls http://0.0.0.0:2379,http://0.0.0.0:4001 \
- --advertise-client-urls http://#{node_addr}:2379,http://#{node_addr}:4001 \
- --initial-advertise-peer-urls http://#{node_addr}:2380,http://#{node_addr}:7001 \
- --listen-peer-urls http://#{node_addr}:2380 \
- --initial-cluster #{node_peers.join(",")} --initial-cluster-state new \
-  0<&- &>/tmp/etcd.log &) || exit 1
-
-## start consul
-(nohup consul agent -server #{consul_join_flag} #{consul_bootstrap_flag} \
- -bind=#{node_addr} -data-dir /opt/consul 0<&- &>/tmp/consul.log &) || exit 1
-
-SCRIPT
-            node.vm.provision "shell", run: "always" do |s|
-                s.inline = provision_node
-            end
-
-            if n == (num_nodes - 1) then
-              node.vm.provision "ansible" do |ansible|
-                  ansible.playbook = "playbook.yml"
-                  ansible.groups = ANSIBLE_GROUPS
-                  ansible.limit = "all"
-              end
-            end
-            # forward netmaster port
-            if n == 0 then
-                node.vm.network "forwarded_port", guest: 5050, host: 5050
-                node.vm.network "forwarded_port", guest: 8080, host: 8080
-                node.vm.network "forwarded_port", guest: 9999, host: 9090
-            end
-        end
-    end
-end
diff --git a/mgmtfn/mesos-docker/docker.json b/mgmtfn/mesos-docker/docker.json
deleted file mode 100644
index abec94155..000000000
--- a/mgmtfn/mesos-docker/docker.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "container": {
-    "type": "DOCKER",
-    "docker": {
-      "image": "libmesos/ubuntu",
-      "parameters": [
-                { "key": "net", "value": "contiv" }
-      ]
-    }
-  },
-  "id": "ubuntu",
-  "instances": 2,
-  "constraints": [ ["hostname", "UNIQUE", ""] ],
-  "cpus": 1,
-  "mem": 128,
-  "uris": [],
-  "cmd": "while sleep 10; do date -u +%T; done"
-}
diff --git a/mgmtfn/mesos-docker/launch.sh b/mgmtfn/mesos-docker/launch.sh
deleted file mode 100755
index ba02f82de..000000000
--- a/mgmtfn/mesos-docker/launch.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-# Launch a marathon job
-
-USAGE="Usage: $0 <marathon-json-file>"
-
-if [ $# -ne 1 ]; then
-    echo $USAGE
-    exit 1
-fi
-
-curl -X POST -H "Content-Type: application/json" http://localhost:8080/v2/apps -d@$1
diff --git a/mgmtfn/mesos-docker/playbook.yml b/mgmtfn/mesos-docker/playbook.yml
deleted file mode 100644
index e065c2485..000000000
--- a/mgmtfn/mesos-docker/playbook.yml
+++ /dev/null
@@ -1,54 +0,0 @@
----
-- hosts: master
-  remote_user: vagrant
-  become: yes
-  become_method: sudo
-  tasks:
-#      - name: upgrade system (redhat)
-#        yum:
-#          update_cache: true
-#          name: '*'
-#          state: latest
-      - name: install mesosphere yum repo
-        yum: name=http://repos.mesosphere.com/el/7/noarch/RPMS/mesosphere-el-repo-7-1.noarch.rpm state=present
-      - name: install zookeeper yum repo
-        yum: name=http://archive.cloudera.com/cdh4/one-click-install/redhat/6/x86_64/cloudera-cdh-4-0.x86_64.rpm state=present
-      - name: install zookeeper
-        yum: pkg=zookeeper,zookeeper-server state=latest
-      - name: configure zookeeper ID
-        become_user: zookeeper
-        shell: zookeeper-server-initialize --force --myid=1
-      - name: install mesos and marathon packages
-        yum: pkg=device-mapper-event-libs,mesos-0.27.0,marathon-0.14.0 state=latest
-      - name: configure containerizers
-        lineinfile: dest=/etc/mesos-slave/containerizers create=yes line="docker,mesos"
-      - name: start zookeeper
-        service: name=zookeeper-server state=started enabled=yes
-      - name: start mesos-master
-        service: name=mesos-master state=started enabled=yes
-      - name: start mesos-slave
-        service: name=mesos-slave state=started enabled=yes
-      - name: start marathon
-        service: name=marathon state=started enabled=yes
-
-
-- hosts: nodes
-  remote_user: vagrant
-  become: yes
-  become_method: sudo
-  tasks:
-#      - name: upgrade system (redhat)
-#        yum:
-#          update_cache: true
-#          name: '*'
-#          state: latest
-      - name: install mesosphere yum repo
-        yum: name=http://repos.mesosphere.com/el/7/noarch/RPMS/mesosphere-el-repo-7-1.noarch.rpm state=present
-      - name: install mesos packages
-        yum: pkg=device-mapper-event-libs,mesos-0.27.0 state=latest
-      - name: configure containerizers
-        lineinfile: dest=/etc/mesos-slave/containerizers create=yes line="docker,mesos"
-      - name: set zookeeper master
-        replace: dest=/etc/mesos/zk regexp="localhost" replace="192.168.33.10"
-      - name: start mesos-slave
-        service: name=mesos-slave state=started enabled=yes
diff --git a/mgmtfn/mesos-docker/startPlugin.sh b/mgmtfn/mesos-docker/startPlugin.sh
deleted file mode 100755
index 56293f5eb..000000000
--- a/mgmtfn/mesos-docker/startPlugin.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-# Start netplugin on this setup
-
-../../scripts/python/startPlugin.py -nodes 192.168.33.10,192.168.33.11
-
-# Create a network to launch docker containers
-netctl net create contiv -s 10.1.1.0/24
diff --git a/contrib/completion/bash/netctl b/scripts/contrib/completion/bash/netctl
similarity index 100%
rename from contrib/completion/bash/netctl
rename to scripts/contrib/completion/bash/netctl