Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #23844: Ansible collection does not support amazon 2023 #71

Merged
merged 1 commit into from Dec 7, 2023
Merged

Fixes #23844: Ansible collection does not support amazon 2023 #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion roles/rudder_agent/tasks/main.yml
View file
Open in desktop
Expand Up @@ -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
2 changes: 1 addition & 1 deletion roles/rudder_relay/tasks/main.yml
View file
Open in desktop
Expand Up @@ -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
9 changes: 2 additions & 7 deletions roles/rudder_repository/tasks/main.yml
View file
Open in desktop
Expand Up @@ -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"
7 changes: 6 additions & 1 deletion roles/rudder_repository/tasks/redhat.yml
View file
Open in desktop
Expand Up @@ -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:
Expand Down
9 changes: 2 additions & 7 deletions roles/rudder_server/tasks/main.yml
View file
Open in desktop
Expand Up @@ -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"