Merge branch 'develop' into wip/mgiacomo/3110/disable-unused-services…

…-0711-1

.github/workflows/dokken-system-tests.yml

@@ -31,7 +31,6 @@ jobs:
         os:
           - alinux2
           - alinux-2023
-          - centos7
           - ubuntu2004
           - ubuntu2204
           - rhel8

CHANGELOG.md

@@ -10,6 +10,9 @@ This file is used to list changes made in each version of the AWS ParallelCluste
 - Allow custom actions on Login Nodes.
 - Disable unused background services wpa_supplicant and cups to improve security.
 
+**BUG FIXES**
+- Fix EFA kmod installation with RHEL 8.10 or newer.
+
 3.10.1
 ------
 

cookbooks/aws-parallelcluster-environment/resources/efa/efa_redhat8.rb

@@ -22,7 +22,7 @@
 
 action_class do
   def efa_supported?
-    if node['platform_version'].to_f < 8.4
+    if Gem::Version.new(node['platform_version']) < Gem::Version.new("8.4")
       log "EFA is not supported in this RHEL version #{node['platform_version']}, supported versions are >= 8.4" do
         level :warn
       end

cookbooks/aws-parallelcluster-environment/resources/efa/efa_rocky8.rb

@@ -22,7 +22,7 @@
 
 action_class do
   def efa_supported?
-    if node['platform_version'].to_f < 8.4
+    if Gem::Version.new(node['platform_version']) < Gem::Version.new("8.4")
       log "EFA is not supported in this Rocky Linux version #{node['platform_version']}, supported versions are >= 8.4" do
         level :warn
       end

cookbooks/aws-parallelcluster-environment/resources/lustre/lustre_redhat8.rb

@@ -26,16 +26,13 @@
 action :setup do
   version = node['platform_version']
   log "Installing FSx for Lustre. Platform version: #{version}, kernel version: #{node['cluster']['kernel_release']}"
-  if version.length == 3 # If version is 8.10 or more, this block is skipped
-    if version.to_f < 8.2
-      raise "FSx for Lustre is not supported in this RHEL version #{version}, supported versions are >= 8.2"
-    elsif version.to_f == 8.7 && (node['cluster']['kernel_release'].include?("4.18.0-425.3.1.el8") || node['cluster']['kernel_release'].include?("4.18.0-425.13.1.el8_7"))
-      # Rhel8.7 kernel 4.18.0-425.3.1.el8 and 4.18.0-425.13.1.el8_7 has broken kABI compat
-      # See https://access.redhat.com/solutions/6985596 and https://github.com/openzfs/zfs/issues/14724
-      raise "FSx for Lustre is not supported in kernel version #{node['cluster']['kernel_release']} of RHEL #{version}, please update the kernel version"
-    else
-      action_install_lustre
-    end
+  current_version = Gem::Version.new(version)
+  if current_version < Gem::Version.new("8.2")
+    raise "FSx for Lustre is not supported in this RHEL version #{version}, supported versions are >= 8.2"
+  elsif current_version == Gem::Version.new("8.7") && (node['cluster']['kernel_release'].include?("4.18.0-425.3.1.el8") || node['cluster']['kernel_release'].include?("4.18.0-425.13.1.el8_7"))
+    # Rhel8.7 kernel 4.18.0-425.3.1.el8 and 4.18.0-425.13.1.el8_7 has broken kABI compat
+    # See https://access.redhat.com/solutions/6985596 and https://github.com/openzfs/zfs/issues/14724
+    raise "FSx for Lustre is not supported in kernel version #{node['cluster']['kernel_release']} of RHEL #{version}, please update the kernel version"
   else
     action_install_lustre
   end

cookbooks/aws-parallelcluster-environment/resources/lustre/lustre_rocky8.rb

@@ -26,16 +26,13 @@
 action :setup do
   version = node['platform_version']
   log "Installing FSx for Lustre. Platform version: #{version}, kernel version: #{node['cluster']['kernel_release']}"
-  if version.length == 3 # If version is 8.10 or more, this block is skipped
-    if version.to_f < 8.2
-      raise "FSx for Lustre is not supported in this Rocky Linux version #{version}, supported versions are >= 8.2"
-    elsif version.to_f == 8.7 && (node['cluster']['kernel_release'].include?("4.18.0-425.3.1.el8") || node['cluster']['kernel_release'].include?("4.18.0-425.13.1.el8_7"))
-      # Rhel8.7 kernel 4.18.0-425.3.1.el8 and 4.18.0-425.13.1.el8_7 has broken kABI compat
-      # See https://access.redhat.com/solutions/6985596 and https://github.com/openzfs/zfs/issues/14724
-      raise "FSx for Lustre is not supported in kernel version #{node['cluster']['kernel_release']} of Rocky Linux #{version}, please update the kernel version"
-    else
-      action_install_lustre
-    end
+  current_version = Gem::Version.new(version)
+  if current_version < Gem::Version.new("8.2")
+    raise "FSx for Lustre is not supported in this Rocky Linux version #{version}, supported versions are >= 8.2"
+  elsif current_version == Gem::Version.new("8.7") && (node['cluster']['kernel_release'].include?("4.18.0-425.3.1.el8") || node['cluster']['kernel_release'].include?("4.18.0-425.13.1.el8_7"))
+    # Rhel8.7 kernel 4.18.0-425.3.1.el8 and 4.18.0-425.13.1.el8_7 has broken kABI compat
+    # See https://access.redhat.com/solutions/6985596 and https://github.com/openzfs/zfs/issues/14724
+    raise "FSx for Lustre is not supported in kernel version #{node['cluster']['kernel_release']} of Rocky Linux #{version}, please update the kernel version"
   else
     action_install_lustre
   end