basic refactor and simplification of os-specific tasks

Signed-off-by: Karl Hepworth <[email protected]>

Author: fubarhouse

tasks/source.yml

@@ -2,51 +2,39 @@
 
 - name: "CURL | Include OS-specific variables (CentOS)"
   include_vars: "{{ ansible_distribution }}.yml"
-  when:
-  - ansible_os_family == "RedHat"
-  - ansible_distribution != "Fedora"
-  - ansible_distribution == "CentOS"
+  when: ansible_distribution == "CentOS"
 
 - name: "CURL | Include OS-specific variables (Debian)"
   include_vars: "{{ ansible_os_family }}.yml"
   when: ansible_os_family == "Debian"
 
-- name: "CURL | Install dependencies (Debian)"
-  apt:
+- name: "CURL | Include OS-specific variables (RedHat)"
+  include_vars: "{{ ansible_distribution }}.yml"
+  when: ansible_os_family == "RedHat"
+
+- name: "CURL | Install dependencies (CentOS)"
+  yum:
     name: "{{ item }}"
     state: installed
   with_items:
     - "{{ curl_source_dependencies }}"
-  when: ansible_os_family == "Debian"
+  when: ansible_distribution == "RedHat"
 
-- name: "CURL | Include OS-specific variables (Fedora)"
-  include_vars: "{{ ansible_distribution }}.yml"
-  when: ansible_distribution == "Fedora"
-
-- name: "CURL | Install dependencies (Fedora)"
-  dnf:
+- name: "CURL | Install dependencies (Debian)"
+  apt:
     name: "{{ item }}"
     state: installed
   with_items:
     - "{{ curl_source_dependencies }}"
-  when: ansible_distribution == "Fedora"
-
-- name: "CURL | Include OS-specific variables (RedHat)"
-  include_vars: "{{ ansible_os_family }}.yml"
-  when:
-  - ansible_os_family == "RedHat"
-  - ansible_distribution != "Fedora"
-  - ansible_distribution != "CentOS"
+  when: ansible_os_family == "Debian"
 
 - name: "CURL | Install dependencies (RedHat)"
-  yum:
+  dnf:
     name: "{{ item }}"
     state: installed
   with_items:
     - "{{ curl_source_dependencies }}"
-  when:
-    - ansible_os_family == "RedHat"
-    - ansible_distribution != "Fedora"
+  when: ansible_distribution == "RedHat"
 
 - name: "CURL | Get current version"
   shell: curl --version | cat

tests/test-package.yml

@@ -15,7 +15,7 @@
 
     - name: DNF clean
       shell: dnf clean all --enablerepo=\*
-      when: ansible_os_family == 'RedHat'
+      when: ansible_distribution != "CentOS"
       changed_when: false
 
   roles:

tests/test-source.yml

@@ -18,7 +18,7 @@
 
     - name: DNF clean
       shell: dnf clean all --enablerepo=\*
-      when: ansible_distribution == "Fedora"
+      when: ansible_distribution != "CentOS"
       changed_when: false
 
   roles: