Let's target only SUSE machines for now

roles/common/tasks/main.yml

@@ -20,12 +20,9 @@
 
 - name: add ANKA repo
   zypper_repository: name=repo-anka repo={{ anka_suse_repo }}
-  when: is_open_suse
 
 - name: add ufo-kit repo
   zypper_repository: name=repo-ufo-kit repo={{ our_suse_repo }}
-  when: is_open_suse
 
 - name: refresh ufo-kit repo
-  command: zypper ref repo-ufo-kit
-  when: is_open_suse
+  command: zypper --gpg-auto-import-keys ref repo-ufo-kit

roles/compute-production/tasks/main.yml

@@ -1,9 +1,8 @@
 ---
 - name: install ufo
-  zypper: name=$item state=latest
+  zypper: name={{ item }} state=latest
   with_items:
     - ufo-core
     - ufo-filters
     - ufo-scripts
     - python-ufo-tools
-  when: is_open_suse

roles/nvidia/tasks/main.yml

@@ -7,11 +7,9 @@
 
 - name: add nvidia repo
   zypper_repository: name=repo-nvidia repo={{ nvidia_suse_repo }}
-  when: is_open_suse
 
 - name: refresh nvidia repo
   command: zypper ref repo-nvidia
-  when: is_open_suse
 
 - name: unload nouveau
   modprobe: name=nouveau state=absent

setup.yml

@@ -1,7 +1,6 @@
 ---
 - hosts: staging-compute
   vars_files:
-    - vars.yml
     - vars/{{ ansible_os_family }}.yml
   roles:
     - compute-staging
@@ -10,7 +9,6 @@
 
 - hosts: production-compute
   vars_files:
-    - vars.yml
     - vars/{{ ansible_os_family }}.yml
   roles:
     - compute-production
@@ -19,7 +17,6 @@
 
 - hosts: control
   vars_files:
-    - vars.yml
     - vars/{{ ansible_os_family }}.yml
   roles:
     - control
@@ -28,7 +25,6 @@
 
 - hosts: detectors
   vars_files:
-    - vars.yml
     - vars/{{ ansible_os_family }}.yml
   roles:
     - detector
@@ -37,7 +33,6 @@
 
 - hosts: nvidia
   vars_files:
-    - vars.yml
     - vars/{{ ansible_os_family }}.yml
   roles:
     - nvidia

vars.yml

@@ -1,2 +0,0 @@
----
-is_open_suse: "'ansible_os_family' == 'Suse'"