Skip to content

Commit

Permalink
refactor: Use vars/RedHat_N.yml symlink for CentOS, Rocky, Alma where…
Browse files Browse the repository at this point in the history
…ver possible

We have a lot of requests to support Rocky and Alma in various system roles. The
first part of adding support is adding `vars/` files for these platforms. In
almost every case, for a given major version N, the vars file RedHat_N.yml can
be used for CentOS, Rocky, and Alma.  Rather than making a copy of the
RedHat_N.yml file, just use a symlink to reduce size and maintenance burden, and
standardize this across all system roles for consistency.

NOTE: OracleLinux is not a strict clone, so we are not going to do this for
OracleLinux at this time.  Support for OracleLinux will need to be done in
separate PRs. For more information, see
linux-system-roles/cockpit#130

Note that there may be more work to be done to the role to fully support Rocky
and Alma.  Many roles have conditionals like this:

```yaml
some_var: "{{ 'some value' if ansible_distribution in ['CentOS', 'RedHat'] else 'other value' }}"
another_var: "{{ 'some value' if ansible_distribution in ['CentOS', 'Fedora', 'RedHat'] else 'other value' }}"

...

- name: Do something
  when: ansible_distribution in ['CentOS', 'RedHat']
  ...
- name: Do something else
  when: ansible_distribution in ['CentOS', 'Fedora', 'RedHat']
  ...
```

Adding Rocky and AlmaLinux to these conditionals will have to be done
separately. In order to simplify the task, some new variables are being
introduced:

```yaml
__$rolename_rh_distros:
  - AlmaLinux
  - CentOS
  - RedHat
  - Rocky

__$rolename_rh_distros_fedora: "{{ __$rolename_rh_distros + ['Fedora'] }}"

__$rolename_is_rh_distro: "{{ ansible_distribution in __$rolename_rh_distros }}"
__$rolename_is_rh_distro_fedora: "{{ ansible_distribution in __$rolename_rh_distros_fedora }}"
```

Then the conditionals can be rewritten as:

```yaml
some_var: "{{ 'some value' if __$rolename_is_rh_distro else 'other value' }}"
another_var: "{{ 'some value' if __$rolename_is_rh_distro_fedora else 'other value' }}"

...

- name: Do something
  when: __$rolename_is_rh_distro | bool
  ...
- name: Do something else
  when: __$rolename_is_rh_distro_fedora | bool
  ...
```

For tests - tests that use such conditionals will need to use `vars_files` or
`include_vars` to load the variables that are defined in
`tests/vars/rh_distros_vars.yml`:

```yaml
vars_files:
  - vars/rh_distros_vars.yml
```

We don't currently have CI testing for Rocky or Alma, so someone wanting to run
tests on those platforms would need to change the test code to use these.

Signed-off-by: Rich Megginson <[email protected]>
  • Loading branch information
richm committed Oct 18, 2024
1 parent 9e457c6 commit 56857d3
Show file tree
Hide file tree
Showing 14 changed files with 45 additions and 28 deletions.
16 changes: 16 additions & 0 deletions tests/vars/rh_distros_vars.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# vars for handling conditionals for RedHat and clones
# DO NOT EDIT - file is auto-generated
---
# Ansible distribution identifiers that the role treats like RHEL
__template_rh_distros:
- AlmaLinux
- CentOS
- RedHat
- Rocky

# Same as above but includes Fedora
__template_rh_distros_fedora: "{{ __template_rh_distros + ['Fedora'] }}"
# Use this in conditionals to check if distro is Red Hat or clone
__template_is_rh_distro: "{{ ansible_distribution in __template_rh_distros }}"
# Use this in conditionals to check if distro is Red Hat or clone, or Fedora
__template_is_rh_distro_fedora: "{{ ansible_distribution in __template_rh_distros_fedora }}"
1 change: 1 addition & 0 deletions vars/AlmaLinux_10.yml
1 change: 1 addition & 0 deletions vars/AlmaLinux_7.yml
1 change: 1 addition & 0 deletions vars/AlmaLinux_8.yml
1 change: 1 addition & 0 deletions vars/AlmaLinux_9.yml
7 changes: 0 additions & 7 deletions vars/CentOS_10.yml

This file was deleted.

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

This file was deleted.

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

This file was deleted.

1 change: 1 addition & 0 deletions vars/CentOS_8.yml
7 changes: 0 additions & 7 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_7.yml
1 change: 1 addition & 0 deletions vars/Rocky_8.yml
1 change: 1 addition & 0 deletions vars/Rocky_9.yml
17 changes: 17 additions & 0 deletions vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,20 @@ __template_required_facts:
# the 'gather_subset' parameter of the 'setup' module
__template_required_facts_subsets: "{{ ['!all', '!min'] +
__template_required_facts }}"

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

# Same as above but includes Fedora
__template_rh_distros_fedora: "{{ __template_rh_distros + ['Fedora'] }}"
# Use this in conditionals to check if distro is Red Hat or clone
__template_is_rh_distro: "{{ ansible_distribution in __template_rh_distros }}"

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

0 comments on commit 56857d3

Please sign in to comment.