Move vagrant files; fix readme

Signed-off-by: Sukhesh Halemane <[email protected]>

Author: Sukhesh Halemane

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)

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!

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"

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"

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"

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

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