From 2722fc9613de2965e0b2d45e6fd5d092b7d2cda8 Mon Sep 17 00:00:00 2001 From: Mathieu Jourdan Date: Mon, 15 Mar 2021 11:41:37 +0100 Subject: [PATCH 1/4] install epel repo from package --- tasks/RedHat.yml | 13 ++++++++----- vars/RedHat.yml | 3 +++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/tasks/RedHat.yml b/tasks/RedHat.yml index bbc4c32..74224e3 100644 --- a/tasks/RedHat.yml +++ b/tasks/RedHat.yml @@ -3,9 +3,12 @@ # 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_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 }} + yum: + name: "{{ fusioninventory__repo_package }}" + state: present diff --git a/vars/RedHat.yml b/vars/RedHat.yml index f192008..949c0f9 100644 --- a/vars/RedHat.yml +++ b/vars/RedHat.yml @@ -10,3 +10,6 @@ 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 }}" From cb5929938d991632f6b549ac1a73d0ee79ac497b Mon Sep 17 00:00:00 2001 From: Mathieu Jourdan Date: Mon, 15 Mar 2021 12:11:47 +0100 Subject: [PATCH 2/4] enable powertools repository for RedHat8 --- tasks/RedHat.yml | 9 +++++++++ vars/RedHat.yml | 5 +++++ 2 files changed, 14 insertions(+) diff --git a/tasks/RedHat.yml b/tasks/RedHat.yml index 74224e3..3a6f33c 100644 --- a/tasks/RedHat.yml +++ b/tasks/RedHat.yml @@ -12,3 +12,12 @@ yum: 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 }}" + when: ansible_facts['distribution_major_version'] | int >= 8 diff --git a/vars/RedHat.yml b/vars/RedHat.yml index 949c0f9..46ce2b9 100644 --- a/vars/RedHat.yml +++ b/vars/RedHat.yml @@ -13,3 +13,8 @@ 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" From 2bb30555029b2cd5b39882006750297712838b13 Mon Sep 17 00:00:00 2001 From: Mathieu Jourdan Date: Mon, 15 Mar 2021 13:54:59 +0100 Subject: [PATCH 3/4] add EL 8 to supported platforms --- meta/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/main.yml b/meta/main.yml index 297270b..b917a7c 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -16,6 +16,7 @@ galaxy_info: - stretch - name: EL versions: + - 8 - 7 galaxy_tags: - agent From 0f0be2616c909c7050903f2044fb8397a3f49b95 Mon Sep 17 00:00:00 2001 From: Mathieu Jourdan Date: Tue, 11 May 2021 17:01:28 +0200 Subject: [PATCH 4/4] 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" +