Merge pull request #25 from leifmadsen/enhance/allow_easier_var_override

Allow for easier variable overrides

.gitignore

@@ -1,4 +1,10 @@
 *.retry
+
+# ignore inventory except for the example inventory (allow for override)
+inventory/
 !inventory/virthost.inventory
 !inventory/vms.inventory
-inventory/
+
+# ignore group_vars files except for the all.yml (allow for override)
+group_vars/
+!group_vars/all.yml

ansible.cfg

@@ -1,2 +1,3 @@
 [defaults]
 host_key_checking = False
+retry_files_enabled = False

gluster-install.yml

@@ -2,17 +2,13 @@
 - hosts: all_vms
   become: true
   become_user: root
-  vars_files:
-    - vars/all.yml
   tasks: []
   roles:
     - { role: glusterfs-install }
 
 - hosts: master
   become: true
   become_user: root
-  vars_files:
-    - vars/all.yml
   tasks: []
   roles:
     - { role: glusterfs-probe-peers }
@@ -23,8 +19,6 @@
     - { role: glusterfs-create-volume, volume_appendix: 5 }
 
 - hosts: master
-  vars_files:
-    - vars/all.yml
   tasks: []
   roles:
     - { role: glusterfs-kube-config }

vars/all.yml → group_vars/all.yml

@@ -61,4 +61,4 @@ spare_disk_size_megs: 4096
 spare_disk_location: "/var/lib/libvirt/images"
 spare_disk_dev: vdb
 # Default size is megs, "2G" would be 2 gigs.
-brick_size: "1980"
+brick_size: "1980"

kube-install.yml

@@ -2,8 +2,6 @@
 - hosts: all_vms
   become: true
   become_user: root
-  vars_files:
-    - vars/all.yml
   tasks: []
   roles:
     # - { role: docker-install }
@@ -17,8 +15,6 @@
 - hosts: master
   become: true
   become_user: root
-  vars_files:
-    - vars/all.yml
   tasks: []
   roles:
     - { role: kube-init }
@@ -28,8 +24,6 @@
 # without become.
 
 - hosts: master
-  vars_files:
-    - vars/all.yml
   vars:
     kubectl_environment:
       KUBECONFIG: "{{ kubectl_home }}/admin.conf"
@@ -41,8 +35,6 @@
 - hosts: minions
   become: true
   become_user: root
-  vars_files:
-    - vars/all.yml
   pre_tasks:
     - name: Get kubeadm_join_command from master
       set_fact:

kube-teardown.yml

@@ -2,8 +2,6 @@
 - hosts: all_vms
   become: true
   become_user: root
-  vars_files:
-    - vars/all.yml
   tasks: []
   roles:
-    - { role: kube-teardown }
+    - { role: kube-teardown }

multus-cni.yml

@@ -1,7 +1,5 @@
 ---
 - hosts: all_vms
-  vars_files:
-    - vars/all.yml
   tasks: []
   roles:
     - { role: multus-cni }

roles/cri-o-install/tasks/main.yml

@@ -7,7 +7,7 @@
   when: crio_force
 
 - name: Check for .crio-installed semaphor
-  stat: 
+  stat:
     path: /etc/.crio-installed
   register: crio_semaphor
 
@@ -18,4 +18,4 @@
 - name: Set .crio-installed semaphor file
   file:
     dest: /etc/.crio-installed
-    state: directory
+    state: directory

virt-host-setup.yml

@@ -1,8 +1,6 @@
 ---
 - hosts: kubehost
-  vars_files:
-    - vars/all.yml
   tasks: []
   roles:
     - { role: virthost-basics }
-    - { role: vm-spinup }
+    - { role: vm-spinup }

vm-attach-disk.yml

@@ -1,7 +1,5 @@
 ---
 - hosts: kubehost
-  vars_files:
-    - vars/all.yml
   tasks: []
   roles:
-    - { role: attach-disks }
+    - { role: attach-disks }

vm-teardown.yml

@@ -1,7 +1,5 @@
 ---
 - hosts: kubehost
-  vars_files:
-    - vars/all.yml
   tasks: []
   roles:
-    - { role: vm-teardown }
+    - { role: vm-teardown }