combine bootstrap options, add xenial support

cluster.yml

@@ -1,13 +1,19 @@
 ---
 - hosts: all
-  gather_facts: true
+  gather_facts: false
+  roles:
+    - bootstrap-os
+  tags:
+    - bootstrap-os
 
 - hosts: etcd:!k8s-cluster
+  gather_facts: true
   roles:
     - { role: kubernetes/preinstall, tags: preinstall }
     - { role: etcd, tags: etcd }
 
 - hosts: k8s-cluster
+  gather_facts: true
   roles:
     - { role: kubernetes/preinstall, tags: preinstall }
     - { role: etcd, tags: etcd }
@@ -15,14 +21,17 @@
     - { role: network_plugin, tags: network }
 
 - hosts: kube-master
+  gather_facts: true
   roles:
     - { role: kubernetes/preinstall, tags: preinstall }
     - { role: kubernetes/master, tags: master }
 
 - hosts: k8s-cluster
+  gather_facts: true
   roles:
     - { role: dnsmasq, tags: dnsmasq }
 
 - hosts: kube-master[0]
+  gather_facts: true
   roles:
     - {role: kubernetes-apps, tags: apps}

coreos-bootstrap.yml

@@ -1,5 +0,0 @@
----
-- hosts: all
-  gather_facts: False
-  roles:
-    - coreos-bootstrap

inventory/group_vars/all.yml

@@ -1,3 +1,6 @@
+# Valid bootstrap options (required): xenial, coreos, none
+bootstrap_os: none
+
 # Directory where the binaries will be installed
 bin_dir: /usr/local/bin
 

roles/coreos-bootstrap/tasks/main.yml → roles/bootstrap-os/tasks/bootstrap-coreos.yml

@@ -3,46 +3,50 @@
   raw: stat /opt/bin/.bootstrapped
   register: need_bootstrap
   ignore_errors: True
+  when: bootstrap_os == "coreos"
 
 - name: Bootstrap | Run bootstrap.sh
   script: bootstrap.sh
-  when: need_bootstrap | failed
+  when: (bootstrap_os == "coreos" and need_bootstrap | failed)
 
 - set_fact:
     ansible_python_interpreter: "/opt/bin/python"
+  when: bootstrap_os == "coreos"
 
 - name: Bootstrap | Check if we need to install pip
   shell: "{{ansible_python_interpreter}} -m pip --version"
   register: need_pip
   ignore_errors: True
   changed_when: false
-  when: need_bootstrap | failed
+  when: (bootstrap_os == "coreos" and need_bootstrap | failed)
 
 - name: Bootstrap | Copy get-pip.py
   copy: src=get-pip.py dest=~/get-pip.py
-  when: need_pip | failed
+  when: (bootstrap_os == "coreos" and need_pip | failed)
 
 - name: Bootstrap | Install pip
   shell: "{{ansible_python_interpreter}} ~/get-pip.py"
-  when: need_pip | failed
+  when: (bootstrap_os == "coreos" and need_pip | failed)
 
 - name: Bootstrap | Remove get-pip.py
   file: path=~/get-pip.py state=absent
-  when: need_pip | failed
+  when: (bootstrap_os == "coreos" and need_pip | failed)
 
 - name: Bootstrap | Install pip launcher
   copy: src=runner dest=/opt/bin/pip mode=0755
-  when: need_pip | failed
+  when: (bootstrap_os == "coreos" and need_pip | failed)
 
 - name: Install required python modules
   pip:
     name: "{{ item }}"
   with_items: "{{pip_python_modules}}"
+  when: bootstrap_os == "coreos"
 
 - name: Check configured hostname
   shell: hostname
   register: configured_hostname
+  when: bootstrap_os == "coreos"
 
 - name: Assign inventory name to unconfigured hostnames
   shell: sh -c "echo \"{{inventory_hostname}}\" > /etc/hostname; hostname \"{{inventory_hostname}}\""
-  when: configured_hostname.stdout == 'localhost'
+  when: (bootstrap_os == "coreos" and configured_hostname.stdout == 'localhost')

roles/bootstrap-os/tasks/bootstrap-ubuntu-xenial.yml

@@ -0,0 +1,4 @@
+---
+- name: Bootstrap Xenial target hosts for ansible use
+  raw: apt-get install -y python-minimal
+  when: bootstrap_os == "xenial"

roles/bootstrap-os/tasks/main.yml

@@ -0,0 +1,3 @@
+---
+- include: bootstrap-ubuntu-xenial.yml
+- include: bootstrap-coreos.yml