Support Collections, and native epel-release packages

handlers/main.yml

@@ -1,7 +1,7 @@
 ---
 # handlers file for ensure_repo_epel
 - name: 'ensure_repo_epel.package_facts'
-  package_facts:
+  ansible.builtin.package_facts:
 - name: 'ensure_repo_epel.service_facts'
-  service_facts:
+  ansible.builtin.service_facts:
 

tasks/main.yml

@@ -1,24 +1,5 @@
 ---
 # tasks file for ensure_repo_epel
-- name: 'include variables'
-  when:
-    - ansible_system == 'Linux'
-  include_vars:
-    file: '{{ lookup("first_found", findme ) }}'
-    name: 'ensure_repo_epel'
-  vars:
-    findme:
-      files:
-        - '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}.yml'
-        - '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}-default.yml'
-        - '{{ ansible_distribution }}-default.yml'
-        - '{{ ansible_os_family }}-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}.yml'
-        - '{{ ansible_os_family }}-{{ ansible_distribution_major_version }}-default.yml'
-        - '{{ ansible_os_family }}-default.yml'
-        - 'default.yml'
-      paths:
-        - '../vars/'
-      errors: 'ignore'
 - name: 'package discovery'
   when:
     - ansible_system == 'Linux'
@@ -27,16 +8,10 @@
 - name: 'ensure packages'
   when:
     - ansible_system == 'Linux'
-    - ensure_repo_epel is defined
-    - ensure_repo_epel.package_list is defined
-    - ensure_repo_epel.package_list is iterable
-    - packages[item.name] is not defined
-  package:
-    name: '{{ item.url }}'
-    state: '{{ item.state }}'
-  loop: '{{ ensure_repo_epel.package_list }}'
-  loop_control:
-    label: '{{ item.name }} from {{ item.url }} will be {{ item.state }}'
+    - packages['epel-release'] is not defined
+  ansible.builtin.package:
+    name: 'epel-release'
+    state: 'installed'
   notify:
     - 'ensure_repo_epel.package_facts'
     - 'ensure_repo_epel.service_facts'

vars/RedHat-6-i386.yml

@@ -1,7 +0,0 @@
----
-# vars file for ensure_repo_epel
-package_list:
-  - name: 'epel-release'
-    state: 'present'
-    url: 'https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm'
-

vars/RedHat-6-x86_64.yml

@@ -1,7 +0,0 @@
----
-# vars file for ensure_repo_epel
-package_list:
-  - name: 'epel-release'
-    state: 'present'
-    url: 'https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm'
-

vars/RedHat-7-x86_64.yml

@@ -1,7 +0,0 @@
----
-# vars file for ensure_repo_epel
-package_list:
-  - name: 'epel-release'
-    state: 'present'
-    url: 'https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm'
-

vars/RedHat-8-x86_64.yml

@@ -1,7 +0,0 @@
----
-# vars file for ensure_repo_epel
-package_list:
-  - name: 'epel-release'
-    state: 'present'
-    url: 'https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm'
-

vars/default.yml

@@ -1,2 +0,0 @@
----
-# vars file for ensure_repo_epel