From 0f0be2616c909c7050903f2044fb8397a3f49b95 Mon Sep 17 00:00:00 2001
From: Mathieu Jourdan <m.jourdan@rennesmetropole.fr>
Date: Tue, 11 May 2021 17:01:28 +0200
Subject: [PATCH] manage redhat's mess with repository names

names differ between RedHat 8, CentOS 8.2, CentOS 8.3+...
---
 tasks/RedHat.yml    | 29 ++++++++++++++++++++++-------
 vars/CentOS-8.2.yml | 10 ++++++++++
 vars/CentOS-8.yml   | 10 ++++++++++
 vars/RedHat-8.yml   | 10 ++++++++++
 vars/RedHat.yml     |  6 +-----
 5 files changed, 53 insertions(+), 12 deletions(-)
 create mode 100644 vars/CentOS-8.2.yml
 create mode 100644 vars/CentOS-8.yml
 create mode 100644 vars/RedHat-8.yml

diff --git a/tasks/RedHat.yml b/tasks/RedHat.yml
index 3a6f33c..62b9335 100644
--- a/tasks/RedHat.yml
+++ b/tasks/RedHat.yml
@@ -13,11 +13,26 @@
     name: "{{ fusioninventory__repo_package }}"
     state: present
 
-- name: Enable PowerTools Repository
-  ini_file:
-    path: "{{ fusioninventory__powertools_repo_file }}"
-    section: "{{ item.section }}"
-    option: "{{ item.option }}"
-    value: "{{ item.value }}"
-  loop: "{{ fusioninventory__powertools_repo_params }}"
+- 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
diff --git a/vars/CentOS-8.2.yml b/vars/CentOS-8.2.yml
new file mode 100644
index 0000000..0827f00
--- /dev/null
+++ b/vars/CentOS-8.2.yml
@@ -0,0 +1,10 @@
+---
+# .. 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"
diff --git a/vars/CentOS-8.yml b/vars/CentOS-8.yml
new file mode 100644
index 0000000..d574014
--- /dev/null
+++ b/vars/CentOS-8.yml
@@ -0,0 +1,10 @@
+---
+# .. 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"
diff --git a/vars/RedHat-8.yml b/vars/RedHat-8.yml
new file mode 100644
index 0000000..5d24e25
--- /dev/null
+++ b/vars/RedHat-8.yml
@@ -0,0 +1,10 @@
+---
+# .. 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"
diff --git a/vars/RedHat.yml b/vars/RedHat.yml
index 46ce2b9..0b43b3c 100644
--- a/vars/RedHat.yml
+++ b/vars/RedHat.yml
@@ -13,8 +13,4 @@ fusioninventory__agent_packages:
 
 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 }}"
-fusioninventory__powertools_repo_file: "/etc/yum.repos.d/{{ ansible_distribution }}-PowerTools.repo"
-fusioninventory__powertools_repo_params:
-  - section: PowerTools
-    option: enabled
-    value: "1"
+