Merge pull request #551 from abhinandanpb/master

k8 vagrant - macbook  env

Author: shaleman

scripts/deps

@@ -4,7 +4,7 @@ go get github.com/tools/godep
 go get github.com/aktau/github-release
 go get github.com/contiv/modelgen
 
-if ! go get github.com/golang/lint/golint
+if ! go get -u github.com/golang/lint/golint
 then
   echo "!!! Could not install golint"
   exit 1

scripts/insecure_private_key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzI
+w+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoP
+kcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2
+hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NO
+Td0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcW
+yLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQIBIwKCAQEA4iqWPJXtzZA68mKd
+ELs4jJsdyky+ewdZeNds5tjcnHU5zUYE25K+ffJED9qUWICcLZDc81TGWjHyAqD1
+Bw7XpgUwFgeUJwUlzQurAv+/ySnxiwuaGJfhFM1CaQHzfXphgVml+fZUvnJUTvzf
+TK2Lg6EdbUE9TarUlBf/xPfuEhMSlIE5keb/Zz3/LUlRg8yDqz5w+QWVJ4utnKnK
+iqwZN0mwpwU7YSyJhlT4YV1F3n4YjLswM5wJs2oqm0jssQu/BT0tyEXNDYBLEF4A
+sClaWuSJ2kjq7KhrrYXzagqhnSei9ODYFShJu8UWVec3Ihb5ZXlzO6vdNQ1J9Xsf
+4m+2ywKBgQD6qFxx/Rv9CNN96l/4rb14HKirC2o/orApiHmHDsURs5rUKDx0f9iP
+cXN7S1uePXuJRK/5hsubaOCx3Owd2u9gD6Oq0CsMkE4CUSiJcYrMANtx54cGH7Rk
+EjFZxK8xAv1ldELEyxrFqkbE4BKd8QOt414qjvTGyAK+OLD3M2QdCQKBgQDtx8pN
+CAxR7yhHbIWT1AH66+XWN8bXq7l3RO/ukeaci98JfkbkxURZhtxV/HHuvUhnPLdX
+3TwygPBYZFNo4pzVEhzWoTtnEtrFueKxyc3+LjZpuo+mBlQ6ORtfgkr9gBVphXZG
+YEzkCD3lVdl8L4cw9BVpKrJCs1c5taGjDgdInQKBgHm/fVvv96bJxc9x1tffXAcj
+3OVdUN0UgXNCSaf/3A/phbeBQe9xS+3mpc4r6qvx+iy69mNBeNZ0xOitIjpjBo2+
+dBEjSBwLk5q5tJqHmy/jKMJL4n9ROlx93XS+njxgibTvU6Fp9w+NOFD/HvxB3Tcz
+6+jJF85D5BNAG3DBMKBjAoGBAOAxZvgsKN+JuENXsST7F89Tck2iTcQIT8g5rwWC
+P9Vt74yboe2kDT531w8+egz7nAmRBKNM751U/95P9t88EDacDI/Z2OwnuFQHCPDF
+llYOUI+SpLJ6/vURRbHSnnn8a/XG+nzedGH5JGqEJNQsz+xT2axM0/W/CRknmGaJ
+kda/AoGANWrLCz708y7VYgAtW2Uf1DPOIYMdvo6fxIB5i9ZfISgcJ/bbCUkFrhoH
++vq/5CIWxCPp0f85R4qxxQ5ihxJ0YDQT9Jpx4TMss4PSavPaBH3RXow5Ohe+bYoQ
+NE5OgEXk2wVfZczCZpigBKbKZHNYcelXtTt/nP3rsCuGcM4h53s=
+-----END RSA PRIVATE KEY-----

vagrant/k8s/Vagrantfile

@@ -7,14 +7,6 @@ require 'fileutils'
 # netplugin_synced_gopath="/opt/golang"
 gopath_folder="/opt/gopath"
 
-# method to set up attributes for better performance
-def customize_vm(v)
-  mem = `grep 'MemTotal' /proc/meminfo | sed -e 's/MemTotal://' -e 's/ kB//'`.to_i / 1024 / 8
-  cpus = 4
-  v.customize ["modifyvm", :id, "--memory", mem]
-  v.customize ["modifyvm", :id, "--cpus", cpus]
-end
-
 # method to create an etc_hosts file based on the cluster info
 def create_etc_hosts(cluster)
   if ENV['VAGRANT_CWD'] then
@@ -85,16 +77,16 @@ create_etc_hosts(cluster)
 
 Vagrant.configure(2) do |config|
 
-  config.ssh.password = 'vagrant'
-
+  #config.ssh.password = 'vagrant'
+  config.ssh.insert_key = false
+  config.ssh.private_key_path = "./../../scripts/insecure_private_key"
+  
   config.vm.synced_folder "./export", "/shared"
-  #config.vm.provider(:virtualbox){|v| v.functional_vboxsf = false }
-
   cluster.each do |role, member_list|
     member_list.each do |member_info|
       config.vm.define vm_name = member_info["name"] do |c|
          if ENV['CONTIV_K8'] == "1" then
-       	   c.vm.box_version = "0.0.2"
+       	   c.vm.box_version = "0.0.3"
            box_name = vm_name
 	    if  role == "master" then
 	      c.vm.box = "contiv/k8master"
@@ -125,17 +117,13 @@ Vagrant.configure(2) do |config|
                s.args = [ENV["http_proxy"] || "", ENV["https_proxy"] || ""]
            end
 	else
-	    c.vm.box = "contiv/k8s-centos"
-  	    c.vm.box_version = "0.0.6"
-            c.vm.provision "shell" do |s|
-                s.inline = provision_master
-                s.args = [ENV["http_proxy"] || "", ENV["https_proxy"] || ""]
-            end             
+	    c.vm.box = "centos/7"
+  	    c.vm.box_version = "1607.1"
+	    c.vm.provision "shell" do |s|
+               s.inline = provision_master
+               s.args = [ENV["http_proxy"] || "", ENV["https_proxy"] || ""]
+            end 
 	end
-        # Customize VM for better performance
-        config.vm.provider "virtualbox" do |v|
-          customize_vm(v)
-        end # v
 
         # configure ip address etc
         c.vm.hostname = vm_name
@@ -155,6 +143,7 @@ Vagrant.configure(2) do |config|
         c.vm.provision "shell", inline: <<-EOS
           sudo setenforce 0
           sudo systemctl stop firewalld
+	  sudo /etc/init.d/network restart
           #copy the etc_hosts file we created
           sudo cp /shared/.etc_hosts /etc/hosts
           EOS

vagrant/k8s/cluster_defs.json

@@ -1,5 +1,5 @@
-{"master": [{"name": "k8master", "management_ip": "192.168.2.10", "contiv_control_if": "enp0s8", "contiv_control_ip": "192.168.2.10", "contiv_network_if": "enp0s9", "contiv_network_ip": "10.1.1.10"}],
- "nodes" : [{"name": "k8node-01", "management_ip": "192.168.2.11", "contiv_control_if": "enp0s8", "contiv_control_ip": "192.168.2.11", "contiv_network_if": "enp0s9", "contiv_network_ip": "10.1.1.11", "max_pods": "40"},
-            {"name": "k8node-02", "management_ip": "192.168.2.12", "contiv_control_if": "enp0s8", "contiv_control_ip": "192.168.2.12", "contiv_network_if": "enp0s9", "contiv_network_ip": "10.1.1.12", "max_pods": "40"},
+{"master": [{"name": "k8master", "management_ip": "192.168.2.10", "contiv_control_if": "eth1", "contiv_control_ip": "192.168.2.10", "contiv_network_if": "eth2", "contiv_network_ip": "10.1.1.10"}],
+ "nodes" : [{"name": "k8node-01", "management_ip": "192.168.2.11", "contiv_control_if": "eth1", "contiv_control_ip": "192.168.2.11", "contiv_network_if": "eth2", "contiv_network_ip": "10.1.1.11", "max_pods": "40"},
+            {"name": "k8node-02", "management_ip": "192.168.2.12", "contiv_control_if": "eth1", "contiv_control_ip": "192.168.2.12", "contiv_network_if": "eth2", "contiv_network_ip": "10.1.1.12", "max_pods": "40"},
 	    {"name": "k8node-03", "management_ip": "192.168.2.13", "contiv_control_if": "enp0s8", "contiv_control_ip": "192.168.2.13", "contiv_network_if": "enp0s9", "contiv_network_ip": "10.1.1.13", "max_pods": "40"}]
 }

vagrant/k8s/setup_cluster.sh

@@ -63,12 +63,6 @@ if [ "$k8_sanity" == "" ]; then
    GetContiv
 fi
 
-# add the vagrant box
-vagrant box list | grep "contiv/k8s-centos" | grep "0.0.6" >& /dev/null
-if [ $? -ne 0 ]; then
-  vagrant box add contiv/k8s-centos --box-version 0.0.6
-fi
-
 if [ "$k8_sanity" == "1" ]; then
    if [ ! -f ./contrib ]; then
       git clone https://github.com/jojimt/contrib -b contiv
@@ -87,5 +81,5 @@ vagrant up
 
 if [ "$k8_sanity" == "" ]; then
 # run ansible
-ansible-playbook -i .contiv_k8s_inventory ../../../contrib/ansible/cluster.yml --skip-tags "contiv_restart,ovs_install" -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