k8s contrib dependancy

Author: abhi

vagrant/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 contiv_fabric_mode=default"
+ansible-playbook -i .contiv_k8s_inventory ./contrib/ansible/cluster.yml --tags "contiv_demo" -e "networking=contiv contiv_fabric_mode=default"

vagrant/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_fabric_mode=default contiv_bin_path=$top_dir/contiv_bin contiv_demo=True"
+ansible-playbook -i .contiv_k8s_inventory ./contrib/ansible/cluster.yml --tags "contiv_restart" -e "networking=contiv contiv_fabric_mode=default contiv_bin_path=$top_dir/contiv_bin contiv_demo=True"

vagrant/k8s/setup_cluster.sh

@@ -48,15 +48,28 @@ function GetContiv {
   fi
 }
 
+#GetContrib fetches contrib if not present
+
+function GetContrib {
+	pushd .
+	if [ -f $top_dir/contrib ]; then
+    		echo "netplugin-$contivVer.tar.bz2 found, not fetching."
+  	else
+		git clone https://github.com/jojimt/contrib -b contiv 
+  	fi
+	popd
+}
+
 # kubernetes version to use -- defaults to v1.2.3
 : ${k8sVer:=v1.2.3}
 
 # contiv version
-: ${contivVer:=v0.1-05-05-2016.18-38-56.UTC}
+: ${contivVer:=v0.1-09-08-2016.20-56-40.UTC}
 
 top_dir=$(git rev-parse --show-toplevel | sed 's|/[^/]*$||')
 
 GetKubernetes
+GetContrib
 
 k8_sanity=${CONTIV_K8}
 if [ "$k8_sanity" == "" ]; then
@@ -81,5 +94,5 @@ vagrant up
 
 if [ "$k8_sanity" == "" ]; then
 # run ansible
-ansible-playbook -i .contiv_k8s_inventory ../../../contrib/ansible/cluster.yml --skip-tags "contiv_restart" -e "networking=contiv contiv_fabric_mode=default localBuildOutput=$top_dir/k8s-$k8sVer/kubernetes/server/bin contiv_bin_path=$top_dir/contiv_bin contiv_demo=True"
+ansible-playbook -i .contiv_k8s_inventory ./contrib/ansible/cluster.yml --skip-tags "contiv_restart" -e "networking=contiv contiv_fabric_mode=default localBuildOutput=$top_dir/k8s-$k8sVer/kubernetes/server/bin contiv_bin_path=$top_dir/contiv_bin contiv_demo=True"
 fi