From 795835663c2896aa7b94ffe9c99b8b07017cdae6 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Fri, 18 Oct 2024 16:15:47 -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. --- tests/vars/rh_distros_vars.yml | 18 ++++++++++++++++++ vars/AlmaLinux_10.yml | 18 +----------------- vars/AlmaLinux_7.yml | 1 + vars/AlmaLinux_8.yml | 17 +---------------- vars/AlmaLinux_9.yml | 17 +---------------- vars/CentOS_10.yml | 18 +----------------- vars/CentOS_7.yml | 18 +----------------- vars/CentOS_8.yml | 17 +---------------- vars/CentOS_9.yml | 17 +---------------- vars/Rocky_10.yml | 1 + vars/Rocky_7.yml | 1 + vars/Rocky_8.yml | 17 +---------------- vars/Rocky_9.yml | 17 +---------------- vars/main.yml | 18 ++++++++++++++++++ 14 files changed, 48 insertions(+), 147 deletions(-) create mode 100644 tests/vars/rh_distros_vars.yml mode change 100644 => 120000 vars/AlmaLinux_10.yml create mode 120000 vars/AlmaLinux_7.yml mode change 100644 => 120000 vars/AlmaLinux_8.yml mode change 100644 => 120000 vars/AlmaLinux_9.yml mode change 100644 => 120000 vars/CentOS_10.yml mode change 100644 => 120000 vars/CentOS_7.yml mode change 100644 => 120000 vars/CentOS_8.yml mode change 100644 => 120000 vars/CentOS_9.yml create mode 120000 vars/Rocky_10.yml create mode 120000 vars/Rocky_7.yml mode change 100644 => 120000 vars/Rocky_8.yml mode change 100644 => 120000 vars/Rocky_9.yml diff --git a/tests/vars/rh_distros_vars.yml b/tests/vars/rh_distros_vars.yml new file mode 100644 index 00000000..9406b2b4 --- /dev/null +++ b/tests/vars/rh_distros_vars.yml @@ -0,0 +1,18 @@ +# vars for handling conditionals for RedHat and clones +# DO NOT EDIT - file is auto-generated +--- +# Ansible distribution identifiers that the role treats like RHEL +__storage_rh_distros: + - AlmaLinux + - CentOS + - RedHat + - Rocky + +# Same as above but includes Fedora +__storage_rh_distros_fedora: "{{ __storage_rh_distros + ['Fedora'] }}" + +# Use this in conditionals to check if distro is Red Hat or clone +__storage_is_rh_distro: "{{ ansible_distribution in __storage_rh_distros }}" + +# Use this in conditionals to check if distro is Red Hat or clone, or Fedora +__storage_is_rh_distro_fedora: "{{ ansible_distribution in __storage_rh_distros_fedora }}" diff --git a/vars/AlmaLinux_10.yml b/vars/AlmaLinux_10.yml deleted file mode 100644 index d7eb3f3e..00000000 --- a/vars/AlmaLinux_10.yml +++ /dev/null @@ -1,17 +0,0 @@ ---- -blivet_package_list: - - python3-blivet - - libblockdev-crypto - - libblockdev-dm - - libblockdev-fs - - libblockdev-lvm - - libblockdev-mdraid - - libblockdev-swap - - xfsprogs - - stratisd - - stratis-cli - # XXX libblockdev-s390 is available only on s390 so just add 'libblockdev' everywhere - # else, it is already brought in as dependency of blivet so it's just no-op here - - "{{ 'libblockdev-s390' if ansible_architecture == 's390x' else 'libblockdev' }}" -# vdo not yet available on el10 -# - vdo diff --git a/vars/AlmaLinux_10.yml b/vars/AlmaLinux_10.yml new file mode 120000 index 00000000..f830d5f9 --- /dev/null +++ b/vars/AlmaLinux_10.yml @@ -0,0 +1 @@ +RedHat_10.yml \ No newline at end of file diff --git a/vars/AlmaLinux_7.yml b/vars/AlmaLinux_7.yml new file mode 120000 index 00000000..105e6302 --- /dev/null +++ b/vars/AlmaLinux_7.yml @@ -0,0 +1 @@ +RedHat_7.yml \ No newline at end of file diff --git a/vars/AlmaLinux_8.yml b/vars/AlmaLinux_8.yml deleted file mode 100644 index c635708c..00000000 --- a/vars/AlmaLinux_8.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -blivet_package_list: - - python3-blivet - - libblockdev-crypto - - libblockdev-dm - - libblockdev-lvm - - libblockdev-mdraid - - libblockdev-swap - - vdo - - kmod-kvdo - - xfsprogs - - stratisd - - stratis-cli - # XXX libblockdev-s390 is available only on s390 so just add 'libblockdev' everywhere - # else, it is already brought in as dependency of blivet so it's just no-op here - - "{{ 'libblockdev-s390' if ansible_architecture == 's390x' else 'libblockdev' }}" diff --git a/vars/AlmaLinux_8.yml b/vars/AlmaLinux_8.yml new file mode 120000 index 00000000..ad7713d6 --- /dev/null +++ b/vars/AlmaLinux_8.yml @@ -0,0 +1 @@ +RedHat_8.yml \ No newline at end of file diff --git a/vars/AlmaLinux_9.yml b/vars/AlmaLinux_9.yml deleted file mode 100644 index c635708c..00000000 --- a/vars/AlmaLinux_9.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -blivet_package_list: - - python3-blivet - - libblockdev-crypto - - libblockdev-dm - - libblockdev-lvm - - libblockdev-mdraid - - libblockdev-swap - - vdo - - kmod-kvdo - - xfsprogs - - stratisd - - stratis-cli - # XXX libblockdev-s390 is available only on s390 so just add 'libblockdev' everywhere - # else, it is already brought in as dependency of blivet so it's just no-op here - - "{{ 'libblockdev-s390' if ansible_architecture == 's390x' else 'libblockdev' }}" diff --git a/vars/AlmaLinux_9.yml b/vars/AlmaLinux_9.yml new file mode 120000 index 00000000..0eb3795d --- /dev/null +++ b/vars/AlmaLinux_9.yml @@ -0,0 +1 @@ +RedHat_9.yml \ No newline at end of file diff --git a/vars/CentOS_10.yml b/vars/CentOS_10.yml deleted file mode 100644 index d7eb3f3e..00000000 --- a/vars/CentOS_10.yml +++ /dev/null @@ -1,17 +0,0 @@ ---- -blivet_package_list: - - python3-blivet - - libblockdev-crypto - - libblockdev-dm - - libblockdev-fs - - libblockdev-lvm - - libblockdev-mdraid - - libblockdev-swap - - xfsprogs - - stratisd - - stratis-cli - # XXX libblockdev-s390 is available only on s390 so just add 'libblockdev' everywhere - # else, it is already brought in as dependency of blivet so it's just no-op here - - "{{ 'libblockdev-s390' if ansible_architecture == 's390x' else 'libblockdev' }}" -# vdo not yet available on el10 -# - vdo diff --git a/vars/CentOS_10.yml b/vars/CentOS_10.yml new file mode 120000 index 00000000..f830d5f9 --- /dev/null +++ b/vars/CentOS_10.yml @@ -0,0 +1 @@ +RedHat_10.yml \ No newline at end of file diff --git a/vars/CentOS_7.yml b/vars/CentOS_7.yml deleted file mode 100644 index 8f54e49e..00000000 --- a/vars/CentOS_7.yml +++ /dev/null @@ -1,17 +0,0 @@ ---- -blivet_package_list: - - python-enum34 - - python-blivet3 - - libblockdev-crypto - - libblockdev-dm - - libblockdev-lvm - - libblockdev-mdraid - - libblockdev-swap - # XXX libblockdev-s390 is available only on s390 so just add 'libblockdev' everywhere - # else, it is already brought in as dependency of blivet so it's just no-op here - - "{{ 'libblockdev-s390' if ansible_architecture == 's390x' else 'libblockdev' }}" -# additional options for mkfs when creating a disk volume (whole disk fs) -__storage_blivet_diskvolume_mkfs_option_map: - ext2: '-F' - ext3: '-F' - ext4: '-F' diff --git a/vars/CentOS_7.yml b/vars/CentOS_7.yml new file mode 120000 index 00000000..105e6302 --- /dev/null +++ b/vars/CentOS_7.yml @@ -0,0 +1 @@ +RedHat_7.yml \ No newline at end of file diff --git a/vars/CentOS_8.yml b/vars/CentOS_8.yml deleted file mode 100644 index c635708c..00000000 --- a/vars/CentOS_8.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -blivet_package_list: - - python3-blivet - - libblockdev-crypto - - libblockdev-dm - - libblockdev-lvm - - libblockdev-mdraid - - libblockdev-swap - - vdo - - kmod-kvdo - - xfsprogs - - stratisd - - stratis-cli - # XXX libblockdev-s390 is available only on s390 so just add 'libblockdev' everywhere - # else, it is already brought in as dependency of blivet so it's just no-op here - - "{{ 'libblockdev-s390' if ansible_architecture == 's390x' else 'libblockdev' }}" diff --git a/vars/CentOS_8.yml b/vars/CentOS_8.yml new file mode 120000 index 00000000..ad7713d6 --- /dev/null +++ b/vars/CentOS_8.yml @@ -0,0 +1 @@ +RedHat_8.yml \ No newline at end of file diff --git a/vars/CentOS_9.yml b/vars/CentOS_9.yml deleted file mode 100644 index c635708c..00000000 --- a/vars/CentOS_9.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -blivet_package_list: - - python3-blivet - - libblockdev-crypto - - libblockdev-dm - - libblockdev-lvm - - libblockdev-mdraid - - libblockdev-swap - - vdo - - kmod-kvdo - - xfsprogs - - stratisd - - stratis-cli - # XXX libblockdev-s390 is available only on s390 so just add 'libblockdev' everywhere - # else, it is already brought in as dependency of blivet so it's just no-op here - - "{{ 'libblockdev-s390' if ansible_architecture == 's390x' else 'libblockdev' }}" diff --git a/vars/CentOS_9.yml b/vars/CentOS_9.yml new file mode 120000 index 00000000..0eb3795d --- /dev/null +++ b/vars/CentOS_9.yml @@ -0,0 +1 @@ +RedHat_9.yml \ No newline at end of file diff --git a/vars/Rocky_10.yml b/vars/Rocky_10.yml new file mode 120000 index 00000000..f830d5f9 --- /dev/null +++ b/vars/Rocky_10.yml @@ -0,0 +1 @@ +RedHat_10.yml \ No newline at end of file diff --git a/vars/Rocky_7.yml b/vars/Rocky_7.yml new file mode 120000 index 00000000..105e6302 --- /dev/null +++ b/vars/Rocky_7.yml @@ -0,0 +1 @@ +RedHat_7.yml \ No newline at end of file diff --git a/vars/Rocky_8.yml b/vars/Rocky_8.yml deleted file mode 100644 index c635708c..00000000 --- a/vars/Rocky_8.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -blivet_package_list: - - python3-blivet - - libblockdev-crypto - - libblockdev-dm - - libblockdev-lvm - - libblockdev-mdraid - - libblockdev-swap - - vdo - - kmod-kvdo - - xfsprogs - - stratisd - - stratis-cli - # XXX libblockdev-s390 is available only on s390 so just add 'libblockdev' everywhere - # else, it is already brought in as dependency of blivet so it's just no-op here - - "{{ 'libblockdev-s390' if ansible_architecture == 's390x' else 'libblockdev' }}" diff --git a/vars/Rocky_8.yml b/vars/Rocky_8.yml new file mode 120000 index 00000000..ad7713d6 --- /dev/null +++ b/vars/Rocky_8.yml @@ -0,0 +1 @@ +RedHat_8.yml \ No newline at end of file diff --git a/vars/Rocky_9.yml b/vars/Rocky_9.yml deleted file mode 100644 index c635708c..00000000 --- a/vars/Rocky_9.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -blivet_package_list: - - python3-blivet - - libblockdev-crypto - - libblockdev-dm - - libblockdev-lvm - - libblockdev-mdraid - - libblockdev-swap - - vdo - - kmod-kvdo - - xfsprogs - - stratisd - - stratis-cli - # XXX libblockdev-s390 is available only on s390 so just add 'libblockdev' everywhere - # else, it is already brought in as dependency of blivet so it's just no-op here - - "{{ 'libblockdev-s390' if ansible_architecture == 's390x' else 'libblockdev' }}" diff --git a/vars/Rocky_9.yml b/vars/Rocky_9.yml new file mode 120000 index 00000000..0eb3795d --- /dev/null +++ b/vars/Rocky_9.yml @@ -0,0 +1 @@ +RedHat_9.yml \ No newline at end of file diff --git a/vars/main.yml b/vars/main.yml index b09a049d..5c7a2ab8 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -12,3 +12,21 @@ __storage_required_facts: # the 'gather_subset' parameter of the 'setup' module __storage_required_facts_subsets: "{{ ['!all', '!min'] + __storage_required_facts }}" + +# BEGIN - DO NOT EDIT THIS BLOCK - rh distros variables +# Ansible distribution identifiers that the role treats like RHEL +__storage_rh_distros: + - AlmaLinux + - CentOS + - RedHat + - Rocky + +# Same as above but includes Fedora +__storage_rh_distros_fedora: "{{ __storage_rh_distros + ['Fedora'] }}" + +# Use this in conditionals to check if distro is Red Hat or clone +__storage_is_rh_distro: "{{ ansible_distribution in __storage_rh_distros }}" + +# Use this in conditionals to check if distro is Red Hat or clone, or Fedora +__storage_is_rh_distro_fedora: "{{ ansible_distribution in __storage_rh_distros_fedora }}" +# END - DO NOT EDIT THIS BLOCK - rh distros variables