From 0992cc42f2433881d7a8a29a6e82b86a4e83a481 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Fri, 18 Oct 2024 16:14:37 -0600 Subject: [PATCH] refactor: Use vars/RedHat_N.yml symlink for CentOS, Rocky, Alma wherever 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 https://github.com/linux-system-roles/cockpit/issues/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 --- defaults/main.yml | 11 +++++++++++ tests/vars/rh_distros_vars.yml | 19 +++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 tests/vars/rh_distros_vars.yml diff --git a/defaults/main.yml b/defaults/main.yml index 0671de83a..370c84bc8 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -6,6 +6,7 @@ network_state: {} network_allow_restart: false +# BEGIN - DO NOT EDIT THIS BLOCK - rh distros variables # Ansible distribution identifiers that the role treats like RHEL __network_rh_distros: - AlmaLinux @@ -14,6 +15,16 @@ __network_rh_distros: - RedHat - Rocky +# Same as above but includes Fedora +__network_rh_distros_fedora: "{{ __network_rh_distros + ['Fedora'] }}" + +# Use this in conditionals to check if distro is Red Hat or clone +__network_is_rh_distro: "{{ ansible_distribution in __network_rh_distros }}" + +# Use this in conditionals to check if distro is Red Hat or clone, or Fedora +__network_is_rh_distro_fedora: "{{ ansible_distribution in __network_rh_distros_fedora }}" +# END - DO NOT EDIT THIS BLOCK - rh distros variables + # Use initscripts for RHEL/CentOS < 7, nm otherwise network_provider_os_default: "{{ 'initscripts' if ansible_distribution in __network_rh_distros and diff --git a/tests/vars/rh_distros_vars.yml b/tests/vars/rh_distros_vars.yml new file mode 100644 index 000000000..3d59cc7a8 --- /dev/null +++ b/tests/vars/rh_distros_vars.yml @@ -0,0 +1,19 @@ +# vars for handling conditionals for RedHat and clones +# DO NOT EDIT - file is auto-generated +--- +# Ansible distribution identifiers that the role treats like RHEL +__network_rh_distros: + - AlmaLinux + - CentOS + - OracleLinux + - RedHat + - Rocky + +# Same as above but includes Fedora +__network_rh_distros_fedora: "{{ __network_rh_distros + ['Fedora'] }}" + +# Use this in conditionals to check if distro is Red Hat or clone +__network_is_rh_distro: "{{ ansible_distribution in __network_rh_distros }}" + +# Use this in conditionals to check if distro is Red Hat or clone, or Fedora +__network_is_rh_distro_fedora: "{{ ansible_distribution in __network_rh_distros_fedora }}"