Patch for OSX ansible kubernetes

osx-vagrant-ansible-kube.patch

From 49cb420954939f806a303e08d71292fb293bac6a Mon Sep 17 00:00:00 2001
From: Jay Vyas <[email protected]>
Date: Sat, 28 Nov 2015 12:29:43 -0500
Subject: [PATCH] Changes for Spinning up VMs on OS X, Updating Centos boxes,
 flannel parameterization, docker example paths, hostmanager, ip detection
 from dyn addresses.

---
 ansible/roles/common/tasks/fedora-install.yml  | 12 +++++
 ansible/roles/flannel/templates/flanneld.j2    |  3 +-
 ansible/roles/kubernetes/files/make-ca-cert.sh |  1 +
 ansible/roles/master/defaults/main.yml         |  2 +-
 ansible/roles/node/tasks/localBuildInstall.yml |  2 +-
 ansible/vagrant/Vagrantfile                    | 75 +++++++++++++++-----------
 6 files changed, 62 insertions(+), 33 deletions(-)

diff --git a/ansible/roles/common/tasks/fedora-install.yml b/ansible/roles/common/tasks/fedora-install.yml
index 48454fa..91cb424 100644
--- a/ansible/roles/common/tasks/fedora-install.yml
+++ b/ansible/roles/common/tasks/fedora-install.yml
@@ -5,3 +5,15 @@
     name: python-firewall
     state: latest
   when: ansible_distribution_major_version|int >= 22
+
+- name: Generic | Install Python
+  action: "{{ ansible_pkg_mgr }}"
+  args: 
+    name: python
+    state: latest
+
+- name: Generic | Install SELinux Python Bindings
+  action: "{{ ansible_pkg_mgr }}"
+  args:
+    name: libselinux-python
+    state: latest
diff --git a/ansible/roles/flannel/templates/flanneld.j2 b/ansible/roles/flannel/templates/flanneld.j2
index e24ce89..e8fe9de 100644
--- a/ansible/roles/flannel/templates/flanneld.j2
+++ b/ansible/roles/flannel/templates/flanneld.j2
@@ -8,4 +8,5 @@ FLANNEL_ETCD="{% for node in groups['etcd'] %}http://{{ node }}:2379{% if not lo
 FLANNEL_ETCD_KEY="/{{ cluster_name }}/network"
 
 # Any additional options that you want to pass
-#FLANNEL_OPTIONS=""
+# By default, we just add a good guess for the network interface on Vbox.  Otherwise, Flannel will probably make the right guess.
+FLANNEL_OPTIONS="{% if flannel_iface %}--iface={{ flannel_iface }}{% endif %}"
diff --git a/ansible/roles/kubernetes/files/make-ca-cert.sh b/ansible/roles/kubernetes/files/make-ca-cert.sh
index a9966b7..c7e2672 100755
--- a/ansible/roles/kubernetes/files/make-ca-cert.sh
+++ b/ansible/roles/kubernetes/files/make-ca-cert.sh
@@ -101,6 +101,7 @@ tar xzf easy-rsa.tar.gz
 cd easy-rsa-master/easyrsa3
 
 # Sadly, openssl is very verbose to std*err* with no option to turn it off.
+# Warning: If you get errors on 64 byte length below, --req-cn=kube.example.com will solve the problem.
 if ! (./easyrsa --batch init-pki
       ./easyrsa --batch "--req-cn=${cert_ip}@$(date +%s)" build-ca nopass
       ./easyrsa --batch --subject-alt-name="${sans}" build-server-full "${master_name}" nopass
diff --git a/ansible/roles/master/defaults/main.yml b/ansible/roles/master/defaults/main.yml
index 9c8cc29..128af5f 100644
--- a/ansible/roles/master/defaults/main.yml
+++ b/ansible/roles/master/defaults/main.yml
@@ -1,3 +1,3 @@
 kube_master_insecure_port: 8080
 
-localBuildOutput: ../../_output/local/go/bin
\ No newline at end of file
+localBuildOutput: ../../_output/local/go/bin # localBuildOutput: ../../kubernetes/_output/dockerized/bin/linux/amd64/ (docker builds)
diff --git a/ansible/roles/node/tasks/localBuildInstall.yml b/ansible/roles/node/tasks/localBuildInstall.yml
index f208d48..3619f4d 100644
--- a/ansible/roles/node/tasks/localBuildInstall.yml
+++ b/ansible/roles/node/tasks/localBuildInstall.yml
@@ -1,7 +1,7 @@
 ---
 - name: Copy node binaries
   copy:
-    src: "{{ localBuildOutput }}/{{ item }}"
+    src: "{{ localBuildOutput }}/{{ item }}" #docker builds, use: kubernetes/_output/dockerized/bin/linux/amd64/{{ item }}
     dest: /usr/bin/
     mode: 0755
   with_items:
diff --git a/ansible/vagrant/Vagrantfile b/ansible/vagrant/Vagrantfile
index 7d40fa5..65f9db2 100644
--- a/ansible/vagrant/Vagrantfile
+++ b/ansible/vagrant/Vagrantfile
@@ -6,6 +6,7 @@ require "yaml"
 ### RUN: vagrant plugin uninstall vagrant-openstack-plugin"
 ### Then RUN: "vagrant plugin install vagrant-openstack-provider"
 require 'vagrant-openstack-provider'
+require 'vagrant-hostmanager'
 
 $num_nodes = (ENV['NUM_NODES'] || 2).to_i
 ansible_tags = ENV['ANSIBLE_TAGS']
@@ -15,6 +16,20 @@ VAGRANTFILE_API_VERSION = "2"
 # Openstack providers are best used with latest versions.
 Vagrant.require_version ">= 1.7"
 
+# for vbox, we avoid private networks: Let the vbox VM set the IP and just write it out at runtime.
+def getip(vm, cached_addresses, name)
+	
+	if cached_addresses[vm.name].nil?
+		if hostname = (vm.ssh_info && vm.ssh_info[:host])
+		        vm.communicate.execute("/usr/sbin/ip addr show eth1 | grep 'inet ' | xargs | cut -f 2 -d ' '| cut -f 1 -d '/' 2>&1") do |type, contents|
+		        cached_addresses[name] = contents.split("\n").first[/(\d+\.\d+\.\d+\.\d+)/, 1]
+	           end
+	        end
+         end
+### Since we aren't gauranteed to have calculated the result, just return whatevers in the cache.
+cached_addresses[name]
+end
+
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # By default, Vagrant 1.7+ automatically inserts a different
   # insecure keypair for each new VM created. The easiest way
@@ -59,13 +74,17 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     os.server_name = n.vm.hostname
   end
 
-  def set_vbox(vb, config)
-    config.vm.box = "chef/centos-7.0"
+  def set_vbox(vb, config, cached_addresses_in)
+    config.vm.box = "hfm4/centos7"
     config.vm.network "private_network", type: "dhcp"
     vb.gui = false
     vb.memory = 2048
     vb.cpus = 2
 
+    config.hostmanager.ip_resolver = proc do |vm, resolving_vm|
+      	getip(vm, cached_addresses_in, vm.name)
+    end
+
     # Use faster paravirtualized networking
     vb.customize ["modifyvm", :id, "--nictype1", "virtio"]
     vb.customize ["modifyvm", :id, "--nictype2", "virtio"]
@@ -85,7 +104,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       set_openstack(os, override, n)
     end
     n.vm.provider :virtualbox do |vb, override|
-      set_vbox(vb, override)
+      cached_addresses ||= {}
+      cached_addresses = set_vbox(vb, override, cached_addresses)
     end
     n.vm.provider :libvirt do |lv, override|
       set_libvirt(lv, override)
@@ -93,16 +113,17 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   end
 
   config.vm.synced_folder ".", "/vagrant", disabled: true
-
+  cached_addresses = {}
+  config.hostmanager.enabled = true
   nodes = Array.new()
+
   $num_nodes.times do |i|
-    # multi vm config
-    name = "kube-node-#{i+1}"
-    nodes.push(name)
-    config.vm.define "#{name}" do |n|
-      n.vm.hostname = name
-      set_provider(n)
-    end
+      name="kube-node-#{i+1}"
+      config.vm.define name do |n|
+         n.vm.hostname = name
+         nodes.push(name)
+         set_provider(n)
+      end
   end
 
   # This is how we create the ansible inventory, see it in .vagrant
@@ -114,31 +135,25 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
      "nodes" => nodes,
      "all_groups:children" => ["etcd","masters","nodes"]
   }
-
   config.vm.define "kube-master" do |n|
     name = "kube-master"
     n.vm.hostname = name
     set_provider(n)
-
     if ansible_tags.nil?
-      # This set up the vagrant hosts before we run the main playbook
-      # Today this just creates /etc/hosts so machines can talk via their
-      # 'internal' IPs instead of the openstack public ip.
+      # This sets up both flannel and kube.
       n.vm.provision :ansible do |ansible|
         ansible.groups = groups
-        ansible.playbook = "./vagrant-ansible.yml"
-        ansible.limit = "all" #otherwise the metadata wont be there for ipv4?
-        ansible.raw_ssh_args = ['-o ControlMaster=no']
-      end
-    end
+        ansible.playbook = "../cluster.yml"
 
-    # This sets up both flannel and kube.
-    n.vm.provision :ansible do |ansible|
-      ansible.groups = groups
-      ansible.playbook = "../cluster.yml"
-      ansible.limit = "all" #otherwise the metadata wont be there for ipv4?
-      ansible.tags = ansible_tags
-      ansible.raw_ssh_args = ['-o ControlMaster=no']
-    end
-  end
+        # Most of the time, eth1 is the real address we use for networking.
+        n.vm.provider :virtualbox do |vb, override|
+          ansible.extra_vars = { flannel_iface: "eth1" }
+        end
+
+      	ansible.limit = "all" #otherwise the metadata wont be there for ipv4?
+      	ansible.tags = ansible_tags
+        ansible.raw_ssh_args = ['-o ControlMaster=no']
+      end # provision
+    end # if
+  end # define 
 end