From 588f4ae719ec0fa6df4408537dad4b19fef3ade6 Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Wed, 17 Feb 2021 13:19:35 +0000 Subject: [PATCH] Assume centos version is at least 8.3 Removing this check allows the same code to work on centos-8 stream where the version is reported just as '8'. Change-Id: Icc608500a099f51e5c44cecd1d259ff6315758f7 --- .../notes/centos-minimum-8-3-cd80894c463ed00f.yaml | 9 +++++++++ vars/redhat-8.yml | 3 --- 2 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 releasenotes/notes/centos-minimum-8-3-cd80894c463ed00f.yaml diff --git a/releasenotes/notes/centos-minimum-8-3-cd80894c463ed00f.yaml b/releasenotes/notes/centos-minimum-8-3-cd80894c463ed00f.yaml new file mode 100644 index 00000000..8d1a60e5 --- /dev/null +++ b/releasenotes/notes/centos-minimum-8-3-cd80894c463ed00f.yaml @@ -0,0 +1,9 @@ +--- +upgrade: + - | + In order to accomodate Centos-8 Stream support, it is necessary require + the minimum version of Centos-8 Classic to be 8.3. There are breaking + changes between Stream and Classic versions prior to 8.3 which break + ansible code that detects major/minor versions of Centos. Before + upgrading to Wallaby, deployers should ensure that their Centos hosts + are updated to 8.3. diff --git a/vars/redhat-8.yml b/vars/redhat-8.yml index fdf3c7a7..646e1c74 100644 --- a/vars/redhat-8.yml +++ b/vars/redhat-8.yml @@ -40,11 +40,8 @@ openstack_host_kernel_modules: - name: ip_vs - name: iscsi_tcp - name: nf_conntrack - - name: "{{ ansible_facts['distribution_version'] is version('8.3', '<') | ternary('nf_conntrack_ipv4', '') }}" - - name: "{{ ansible_facts['distribution_version'] is version('8.3', '<') | ternary('nf_conntrack_ipv6', '') }}" - name: nf_defrag_ipv4 - name: nf_nat - - name: "{{ ansible_facts['distribution_version'] is version('8.3', '<') | ternary('nf_nat_ipv4', '') }}" - name: vhost_net ## Base packages