Merge pull request #71 from Fdall/bug_23844/ansible_collection_does_n…

…ot_support_amazon_2023 Fixes #23844: Ansible collection does not support amazon 2023
Normation · Dec 7, 2023 · 93f4acc · 93f4acc
2 parents 15223c5 + 738ac01
commit 93f4acc
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 17 deletions.
diff --git a/roles/rudder_agent/tasks/main.yml b/roles/rudder_agent/tasks/main.yml
@@ -5,6 +5,6 @@
   when: ansible_os_family == "Debian"
 
 - include_tasks: redhat.yml
-  when: ansible_distribution == "CentOS" or ansible_distribution == "Red Hat Enterprise Linux" or ansible_distribution == "RedHat" or ansible_distribution == "Rocky" or ansible_distribution == "AlmaLinux" and ansible_distribution != "Fedora"
+  when: ansible_os_family == "RedHat"
 
 - include_tasks: configure.yml
diff --git a/roles/rudder_relay/tasks/main.yml b/roles/rudder_relay/tasks/main.yml
@@ -11,6 +11,6 @@
   when: ansible_os_family == "Debian"
 
 - include_tasks: redhat.yml
-  when: ansible_distribution == "CentOS" or ansible_distribution == "Red Hat Enterprise Linux" or ansible_distribution == "RedHat" or ansible_distribution == "Rocky" or ansible_distribution == "AlmaLinux" and ansible_distribution != "Fedora"
+  when: ansible_os_family == "RedHat"
 
 - include_tasks: configure.yml
diff --git a/roles/rudder_repository/tasks/main.yml b/roles/rudder_repository/tasks/main.yml
@@ -5,12 +5,7 @@
   when: ansible_os_family == "Suse"
 
 - include_tasks: debian.yml
-  when: (ansible_distribution == "Debian") or
-        (ansible_distribution == "Ubuntu")
+  when: ansible_os_family == "Debian"
 
 - include_tasks: redhat.yml
-  when: (ansible_distribution == "CentOS" and ansible_distribution != "Fedora") or
-        (ansible_distribution == "Rocky" and ansible_distribution != "Fedora") or
-        (ansible_distribution == "AlmaLinux" and ansible_distribution != "Fedora") or
-        (ansible_distribution == "RedHat" and ansible_distribution != "Fedora") or
-        (ansible_distribution == "Red Hat Enterprise Linux" and ansible_distribution != "Fedora")
+  when: ansible_os_family == "RedHat"
diff --git a/roles/rudder_repository/tasks/redhat.yml b/roles/rudder_repository/tasks/redhat.yml
@@ -8,7 +8,12 @@
 - name: Compute Rudder repo
   ansible.builtin.set_fact:
     repository_url: "{{ rudder_repository_repo_url }}/rpm/{{ rudder_version|string }}/RHEL_{{ ansible_distribution_major_version }}/"
-  when: repository_url|length == 0
+  when: repository_url|length == 0 and ansible_distribution != "Amazon" and ansible_distribution_major_version != "2023"
+
+- name: Compute Rudder repo
+  ansible.builtin.set_fact:
+    repository_url: "{{ rudder_repository_repo_url }}/rpm/{{ rudder_version|string }}/AL_2023/"
+  when: repository_url|length == 0 and ansible_distribution == "Amazon" and ansible_distribution_major_version == "2023"
 
 - name: Print repo
   debug:

diff --git a/roles/rudder_server/tasks/main.yml b/roles/rudder_server/tasks/main.yml
@@ -8,12 +8,7 @@
   when: ansible_os_family == "Suse"
 
 - include_tasks: debian.yml
-  when: (ansible_distribution == "Debian") or
-        (ansible_distribution == "Ubuntu")
+  when: ansible_os_family == "Debian"
 
 - include_tasks: redhat.yml
-  when: (ansible_distribution == "CentOS" and ansible_distribution != "Fedora") or
-        (ansible_distribution == "Rocky" and ansible_distribution != "Fedora") or
-        (ansible_distribution == "AlmaLinux" and ansible_distribution != "Fedora") or
-        (ansible_distribution == "RedHat" and ansible_distribution != "Fedora") or
-        (ansible_distribution == "Red Hat Enterprise Linux" and ansible_distribution != "Fedora")
+  when: ansible_os_family == "RedHat"