refactor task includes

2019-09-16 13:57:44 +02:00 · 2019-09-16 13:57:44 +02:00 · fc4cf5e2af
commit fc4cf5e2af
parent ec963f38a7
3 changed files with 11 additions and 7 deletions
--- a/tasks/debian.yml
+++ b/tasks/debian.yml
@ -1,5 +1,5 @@
 ---
- name: Upgrade packages (debian)
+- name: Upgrade packages
  apt:
    update_cache: yes
    upgrade: dist
--- a/tasks/main.yml
+++ b/tasks/main.yml
@ -1,6 +1,10 @@
 ---
- include_tasks: redhat.yml
-  when: "'redhat' in group_names or 'redhat_arm' in group_names"
-
- include_tasks: debian.yml
-  when: "'debian' in group_names or 'debian_pve' in group_names or 'debian_ucs' in group_names"
+- include_tasks: "{{ lookup('first_found', params) }}"
+  vars:
+    params:
+      files:
+        - "{{ ansible_lsb.id | default('') | lower }}.yml"
+        - "{{ ansible_os_family | lower }}.yml"
+      paths:
+        - "tasks"
+      errors: "ignore"
--- a/tasks/redhat.yml
+++ b/tasks/redhat.yml
@ -1,5 +1,5 @@
 ---
- name: Upgrade packages (rhel)
+- name: Upgrade packages
  yum:
    name: "*"
    state: latest