From 920b73d7ff4e88e83a60bcca3d991b014729d795 Mon Sep 17 00:00:00 2001 From: Christian Iuga Date: Wed, 30 Sep 2020 16:05:10 +0200 Subject: [PATCH 1/2] Add RHEL support Followed the procedure : http://fusioninventory.org/documentation/agent/installation/linux/rhel.html - Should possible to add RHEL8 support without huge change --- defaults/main.yml | 37 +------------------------------------ meta/main.yml | 3 +++ tasks/Debian.yml | 10 ++++++++++ tasks/RedHat.yml | 11 +++++++++++ tasks/main.yml | 21 +++++++++++++-------- vars/Debian.yml | 41 +++++++++++++++++++++++++++++++++++++++++ vars/RedHat.yml | 25 +++++++++++++++++++++++++ 7 files changed, 104 insertions(+), 44 deletions(-) create mode 100644 tasks/Debian.yml create mode 100644 tasks/RedHat.yml create mode 100644 vars/Debian.yml create mode 100644 vars/RedHat.yml diff --git a/defaults/main.yml b/defaults/main.yml index 422a1f0..72d65cf 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -13,42 +13,7 @@ # fusioninventory__agent_version: '2.4-2' # ]]] -# .. envvar:: fusioninventory__agent_depend_packages [[[ -# -# List of dependent packages to install. -fusioninventory__agent_depend_packages: - - 'dmidecode' - - 'hwdata' - - 'hdparm' - - 'libuniversal-require-perl' - - 'libwww-perl' - - 'libparse-edid-perl' - - 'libproc-daemon-perl' - - 'libfile-which-perl' - - 'libhttp-daemon-perl' - - 'libxml-treepp-perl' - - 'libyaml-perl' - - 'libnet-cups-perl' - - 'libnet-ip-perl' - - 'libdigest-sha-perl' - - 'libjson-pp-perl' - - 'libsocket-getaddrinfo-perl' - - 'libtext-template-perl' - - 'lsb-base' - - 'xz-utils' - # ]]] -# .. envvar:: fusioninventory__agent_package_url [[[ -# -# The URL used to download deb package for fusioninventory-agent. -# -# See the official documentation for more informations : -# http://fusioninventory.org/documentation/agent/installation/linux/deb.html -# -fusioninventory__agent_package_url: '{{ "http://debian.fusioninventory.org/downloads/fusioninventory-agent_"+ fusioninventory__agent_version + "_all.deb" - if (ansible_distribution_release in - ([ "stretch" ])) - else "" }}' - # ]]] + # .. envvar:: fusioninventory__agent_deploy_state [[[ # # What is the desired state which this role should achieve ? Possible options : diff --git a/meta/main.yml b/meta/main.yml index 0509f82..a6a240e 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -13,6 +13,9 @@ galaxy_info: - name: Debian versions: - stretch + - name: EL + versions: + - 7 galaxy_tags: - agent - fusion diff --git a/tasks/Debian.yml b/tasks/Debian.yml new file mode 100644 index 0000000..f6bfb45 --- /dev/null +++ b/tasks/Debian.yml @@ -0,0 +1,10 @@ +--- +# .. vim: foldmarker=[[[,]]]:foldmethod=marker + +- name: Ensure fusioninventory-agent package from URL + apt: + deb: '{{ fusioninventory__agent_package_url }}' + register: pkg_agent_url_result + until: pkg_agent_url_result is success + when: ((fusioninventory__agent_package_url) and + (fusioninventory__agent_deploy_state == "present")) diff --git a/tasks/RedHat.yml b/tasks/RedHat.yml new file mode 100644 index 0000000..bbc4c32 --- /dev/null +++ b/tasks/RedHat.yml @@ -0,0 +1,11 @@ +--- +# .. vim: foldmarker=[[[,]]]:foldmethod=marker + +# http://fusioninventory.org/documentation/agent/installation/linux/rhel.html + +- 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 }} diff --git a/tasks/main.yml b/tasks/main.yml index 31a329a..45d72ed 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -3,6 +3,12 @@ # # tasks file for fusioninventory +- name: Include package list per OS + include_vars: "{{ item }}" + with_first_found: + - "{{ ansible_distribution }}.yml" + - "{{ ansible_os_family }}.yml" + # Manage dependent packages [[[1 - name: Ensure dependent packages are installed package: @@ -15,17 +21,16 @@ when: fusioninventory__agent_deploy_state == "present" # Manage agent package [[[1 -- name: Ensure fusioninventory-agent package from URL - apt: - deb: '{{ fusioninventory__agent_package_url }}' - register: pkg_agent_url_result - until: pkg_agent_url_result is success - when: ((fusioninventory__agent_package_url) and - (fusioninventory__agent_deploy_state == "present")) + +# Specific tasks per OS will be in the include otherwise below +- include: "{{ item }}" + with_first_found: + - "{{ ansible_distribution }}.yml" + - "{{ ansible_os_family }}.yml" - name: Ensure fusioninventory-agent package from REPOS package: - name: 'fusioninventory-agent' + name: '{{ fusioninventory__agent_packages }}' state: '{{ "present" if (fusioninventory__agent_deploy_state == "present") else "absent" }}' register: pkg_agent_repo_result diff --git a/vars/Debian.yml b/vars/Debian.yml new file mode 100644 index 0000000..831eebd --- /dev/null +++ b/vars/Debian.yml @@ -0,0 +1,41 @@ +--- +# .. vim: foldmarker=[[[,]]]:foldmethod=marker + +# .. envvar:: fusioninventory__agent_depend_packages [[[ +# +# List of dependent packages to install. +fusioninventory__agent_depend_packages: + - 'dmidecode' + - 'hwdata' + - 'hdparm' + - 'libuniversal-require-perl' + - 'libwww-perl' + - 'libparse-edid-perl' + - 'libproc-daemon-perl' + - 'libfile-which-perl' + - 'libhttp-daemon-perl' + - 'libxml-treepp-perl' + - 'libyaml-perl' + - 'libnet-cups-perl' + - 'libnet-ip-perl' + - 'libdigest-sha-perl' + - 'libjson-pp-perl' + - 'libsocket-getaddrinfo-perl' + - 'libtext-template-perl' + - 'lsb-base' + - 'xz-utils' + # ]]] +# .. envvar:: fusioninventory__agent_package_url [[[ +# +# The URL used to download deb package for fusioninventory-agent. +# +# See the official documentation for more informations : +# http://fusioninventory.org/documentation/agent/installation/linux/deb.html +# +fusioninventory__agent_package_url: '{{ "http://debian.fusioninventory.org/downloads/fusioninventory-agent_"+ fusioninventory__agent_version + "_all.deb" + if (ansible_distribution_release in + ([ "stretch" ])) + else "" }}' + # ]]] +fusioninventory__agent_packages: + - 'fusioninventory-agent' diff --git a/vars/RedHat.yml b/vars/RedHat.yml new file mode 100644 index 0000000..b0ead44 --- /dev/null +++ b/vars/RedHat.yml @@ -0,0 +1,25 @@ +--- +# .. vim: foldmarker=[[[,]]]:foldmethod=marker + +# .. envvar:: fusioninventory__agent_depend_packages [[[ +# +# List of dependent packages to install. +fusioninventory__agent_depend_packages: + - 'dmidecode' + # ]]] +# .. envvar:: fusioninventory__agent_package_url [[[ +# +# The URL used to download deb package for fusioninventory-agent. +# +# See the official documentation for more informations : +# http://fusioninventory.org/documentation/agent/installation/linux/deb.html +# +fusioninventory__agent_package_url: '{{ "http://debian.fusioninventory.org/downloads/fusioninventory-agent_"+ fusioninventory__agent_version + "_all.deb" + if (ansible_distribution_release in + ([ "stretch" ])) + else "" }}' + # ]]] + +fusioninventory__agent_packages: + - 'fusioninventory-agent' + - 'fusioninventory-agent-task-inventory' From 1a46ef8a1aa2847fad60c552314e8089c79dff64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gardais=20J=C3=A9r=C3=A9my?= Date: Mon, 5 Oct 2020 12:03:36 +0200 Subject: [PATCH 2/2] Add RHEL7 support (thanks @roumano) --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 76cde4c..c97ee72 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## v1.1.0 + +### Features + +* Add RHEL7 support (thanks @roumano). + ## v1.0.3 ### Fix