Fix provision for CentOS Stream distributions #2

AlmaLinux · Jun 6, 2024 · dcd731d · dcd731d
1 parent bada7ec
commit dcd731d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/resources/roles/install_uninstall/tasks/main.yml b/resources/roles/install_uninstall/tasks/main.yml
@@ -2,7 +2,9 @@
 
 - name: Enable module
   shell: dnf module enable -y "{{ module_name }}:{{ module_stream }}:{{ module_version }}"
-  when: ansible_distribution_file_variety in ('RedHat', 'CentOS') and module_name is defined and module_stream is defined and module_version is defined
+  when: >
+    ansible_facts.os_family == 'RedHat' and
+    module_name is defined and module_stream is defined and module_version is defined
   tags:
     - install_package
 
@@ -12,7 +14,7 @@
     state: present
     allow_downgrade: true
     lock_timeout: 300
-  when: ansible_distribution_file_variety in ('RedHat', 'OracleLinux', 'CentOS')
+  when: ansible_facts.os_family == 'RedHat'
   tags:
     - install_package
 
@@ -32,7 +34,7 @@
   retries: 30
   delay: 10
   until: result.rc == 0
-  when: ansible_distribution_file_variety in ('RedHat', 'OracleLinux', 'CentOS')
+  when: ansible_facts.os_family == 'RedHat'
   tags:
     - uninstall_package
 

diff --git a/resources/roles/preparation/tasks/main.yml b/resources/roles/preparation/tasks/main.yml
@@ -3,7 +3,7 @@
 - name: Initial provision for RPM distributions
   include_tasks:
     file: rhel.yml
-  when: ansible_distribution_file_variety in ('RedHat', 'OracleLinux')
+  when: ansible_facts.os_family == 'RedHat'
   tags:
     - initial_provision
 

diff --git a/resources/roles/preparation/tasks/rhel.yml b/resources/roles/preparation/tasks/rhel.yml
@@ -48,7 +48,9 @@
   with_items:
     - "os"
     - "updates"
-  when: "ansible_distribution_file_variety == 'RedHat' and ansible_facts.distribution_major_version == '6'"
+  when: >
+    ansible_distribution_file_variety in ('RedHat', 'CentOS') and
+    ansible_facts.distribution_major_version == '6'
 
 - name: Add YUM proxy
   ini_file:
@@ -92,7 +94,7 @@
   when: > 
     epel_release_url is defined and
     epel_release_url and
-    ansible_distribution_file_variety in ('RedHat', 'OracleLinux') and
+    ansible_facts.os_family == 'RedHat' and
     ansible_facts.distribution_major_version in ('6', '7')
 
 - name: Disable epel on 7 version 32-bit