meta/main.yml

@@ -16,7 +16,6 @@ galaxy_info:
     - stretch
   - name: EL
     versions:
-    - 8
     - 7
   galaxy_tags:
     - agent

tasks/RedHat.yml

@@ -3,36 +3,9 @@
 
 # http://fusioninventory.org/documentation/agent/installation/linux/rhel.html
 
-- name: Import EPEL GPG key
-  rpm_key:
-    key: "{{ fusioninventory__repo_gpgkey }}"
-    state: present
-
 - name: Add EPEL Repository
-  yum:
-    name: "{{ fusioninventory__repo_package }}"
-    state: present
-
-- name: RedHat 8 specifics
-  block:
-
-  - name: Load additional repository settings for CentOS or RedHat 8
-    include_vars: "{{ item }}"
-    with_first_found:
-    - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml"
-
-  - name: Override repository settings for CentOS <= 8.2
-    include_vars: "CentOS-8.2.yml"
-    when:
-      - ansible_facts['distribution'] == "CentOS"
-      - ansible_facts['distribution_version'] | float <= 8.2
-
-  - name: Enable Additional Repository
-    ini_file:
-      path: "{{ fusioninventory__additional_repo_file }}"
-      section: "{{ item.section }}"
-      option: "{{ item.option }}"
-      value: "{{ item.value }}"
-    loop: "{{ fusioninventory__additional_repo_params }}"
-
-  when: ansible_facts['distribution_major_version'] | int >= 8
+  yum_repository:
+    name: Epel
+    description: EPEL YUM repo
+    baseurl: https://download.fedoraproject.org/pub/epel/$releasever/$basearch/
+    gpgkey: https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-{{ ansible_distribution_major_version }}

vars/CentOS-8.2.yml

@@ -1,10 +0,0 @@
----
-# .. vim: foldmarker=[[[,]]]:foldmethod=marker
-
-# For CentOS Linux 8.2 and below
-# https://wiki.centos.org/Manuals/ReleaseNotes/CentOS8.2011#Yum_repo_file_and_repoid_changes
-fusioninventory__additional_repo_file: "/etc/yum.repos.d/{{ ansible_distribution }}-PowerTools.repo"
-fusioninventory__additional_repo_params:
-  - section: PowerTools
-    option: enabled
-    value: "1"

vars/CentOS-8.yml

@@ -1,10 +0,0 @@
----
-# .. vim: foldmarker=[[[,]]]:foldmethod=marker
-
-# For CentOS Linux 8.3 and above
-# https://wiki.centos.org/Manuals/ReleaseNotes/CentOS8.2011#Yum_repo_file_and_repoid_changes
-fusioninventory__additional_repo_file: "/etc/yum.repos.d/{{ ansible_distribution }}-Linux-PowerTools.repo"
-fusioninventory__additional_repo_params:
-  - section: powertools
-    option: enabled
-    value: "1"

vars/RedHat-8.yml

@@ -1,10 +0,0 @@
----
-# .. vim: foldmarker=[[[,]]]:foldmethod=marker
-
-# For RedHat Entreprise Linux 8
-# https://developers.redhat.com/blog/2018/11/15/introducing-codeready-linux-builder/
-fusioninventory__additionnal_repo_file: "/etc/yum.repos.d/redhat.repo"
-fusioninventory__additionnal_repo_params:
-  - section: codeready-builder-for-rhel-8-x86_64-rpms
-    option: enabled
-    value: "1"

vars/RedHat.yml

@@ -10,7 +10,3 @@ fusioninventory__agent_depend_packages:
 fusioninventory__agent_packages:
   - 'fusioninventory-agent'
   - 'fusioninventory-agent-task-inventory'
-
-fusioninventory__repo_package: "https://dl.fedoraproject.org/pub/epel/epel-release-latest-{{ ansible_distribution_major_version }}.noarch.rpm"
-fusioninventory__repo_gpgkey: "https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-{{ ansible_distribution_major_version }}"
-