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.

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

refactor: Use vars/RedHat_N.yml symlink for CentOS, Rocky, Alma wherever possible #181

Merged
merged 1 commit into from
Oct 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions tests/vars/AlmaLinux_10.yml
1 change: 1 addition & 0 deletions tests/vars/AlmaLinux_8.yml
1 change: 1 addition & 0 deletions tests/vars/AlmaLinux_9.yml
8 changes: 0 additions & 8 deletions tests/vars/CentOS_10.yml

This file was deleted.

1 change: 1 addition & 0 deletions tests/vars/CentOS_10.yml
8 changes: 0 additions & 8 deletions tests/vars/CentOS_7.yml

This file was deleted.

1 change: 1 addition & 0 deletions tests/vars/CentOS_7.yml
8 changes: 0 additions & 8 deletions tests/vars/CentOS_8.yml

This file was deleted.

1 change: 1 addition & 0 deletions tests/vars/CentOS_8.yml
8 changes: 0 additions & 8 deletions tests/vars/CentOS_9.yml

This file was deleted.

1 change: 1 addition & 0 deletions tests/vars/CentOS_9.yml
1 change: 1 addition & 0 deletions tests/vars/Rocky_10.yml
1 change: 1 addition & 0 deletions tests/vars/Rocky_8.yml
1 change: 1 addition & 0 deletions tests/vars/Rocky_9.yml
20 changes: 20 additions & 0 deletions tests/vars/rh_distros_vars.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# vars for handling conditionals for RedHat and clones
# DO NOT EDIT - file is auto-generated
# repo is https://github.com/linux-system-roles/.github
# file is playbooks/templates/tests/vars/rh_distros_vars.yml
---
# Ansible distribution identifiers that the role treats like RHEL
__nbde_client_rh_distros:
- AlmaLinux
- CentOS
- RedHat
- Rocky

# Same as above but includes Fedora
__nbde_client_rh_distros_fedora: "{{ __nbde_client_rh_distros + ['Fedora'] }}"

# Use this in conditionals to check if distro is Red Hat or clone
__nbde_client_is_rh_distro: "{{ ansible_distribution in __nbde_client_rh_distros }}"

# Use this in conditionals to check if distro is Red Hat or clone, or Fedora
__nbde_client_is_rh_distro_fedora: "{{ ansible_distribution in __nbde_client_rh_distros_fedora }}"
22 changes: 0 additions & 22 deletions vars/AlmaLinux_10.yml

This file was deleted.

1 change: 1 addition & 0 deletions vars/AlmaLinux_10.yml
22 changes: 0 additions & 22 deletions vars/AlmaLinux_8.yml

This file was deleted.

1 change: 1 addition & 0 deletions vars/AlmaLinux_8.yml
22 changes: 0 additions & 22 deletions vars/AlmaLinux_9.yml

This file was deleted.

1 change: 1 addition & 0 deletions vars/AlmaLinux_9.yml
22 changes: 0 additions & 22 deletions vars/CentOS_10.yml

This file was deleted.

1 change: 1 addition & 0 deletions vars/CentOS_10.yml
22 changes: 0 additions & 22 deletions vars/CentOS_7.yml

This file was deleted.

1 change: 1 addition & 0 deletions vars/CentOS_7.yml
22 changes: 0 additions & 22 deletions vars/CentOS_8.yml

This file was deleted.

1 change: 1 addition & 0 deletions vars/CentOS_8.yml
22 changes: 0 additions & 22 deletions vars/CentOS_9.yml

This file was deleted.

1 change: 1 addition & 0 deletions vars/CentOS_9.yml
1 change: 1 addition & 0 deletions vars/Rocky_10.yml
1 change: 1 addition & 0 deletions vars/Rocky_8.yml
1 change: 1 addition & 0 deletions vars/Rocky_9.yml
18 changes: 18 additions & 0 deletions vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,21 @@ __nbde_client_required_facts_subsets: "{{ ['!all', '!min'] +
__nbde_client_required_facts }}"

# vim:set ts=2 sw=2 et:

# BEGIN - DO NOT EDIT THIS BLOCK - rh distros variables
# Ansible distribution identifiers that the role treats like RHEL
__nbde_client_rh_distros:
- AlmaLinux
- CentOS
- RedHat
- Rocky

# Same as above but includes Fedora
__nbde_client_rh_distros_fedora: "{{ __nbde_client_rh_distros + ['Fedora'] }}"

# Use this in conditionals to check if distro is Red Hat or clone
__nbde_client_is_rh_distro: "{{ ansible_distribution in __nbde_client_rh_distros }}"

# Use this in conditionals to check if distro is Red Hat or clone, or Fedora
__nbde_client_is_rh_distro_fedora: "{{ ansible_distribution in __nbde_client_rh_distros_fedora }}"
# END - DO NOT EDIT THIS BLOCK - rh distros variables
Loading