From 9dae1c77f4374e76f55a411b3100dd90f77454b0 Mon Sep 17 00:00:00 2001 From: Himani Deshpande Date: Mon, 25 Sep 2023 17:39:22 -0400 Subject: [PATCH] Update CHANGELOG.md and handle unsupported kernel version for Fsx Lustre Client installation for Rocky Linux 8 Update system_authentication w.r.t rhel8 --- CHANGELOG.md | 2 +- .../resources/lustre/lustre_rocky8.rb | 8 +++++--- .../system_authentication/system_authentication_rocky8.rb | 1 + kitchen.docker.yml | 2 +- test/environments/kitchen.rb | 4 ++++ 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f7134c40b7..2b218ccf63 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ This file is used to list changes made in each version of the AWS ParallelCluste ------ **ENHANCEMENTS** +- Add support for Rocky Linux 8. - Install [Spack](https://spack.io) by default in cluster user's home directory. - Add support for `Scheduling/SlurmSettings/Database/DatabaseName` parameter to render `StorageLoc` in the slurmdbd configuration generated by ParallelCluster. @@ -33,7 +34,6 @@ This file is used to list changes made in each version of the AWS ParallelCluste ------ **ENHANCEMENTS** -- Add support for Rocky Linux 8. - Allow configuration of static and dynamic node priorities in compute resources via the ParallelCluster configuration YAML file. - Forward SLURM_RESUME_FILE to ParallelCluster resume program. - Allow to override aws-parallelcluster-node package at cluster creation and update time (only on the head node during update). diff --git a/cookbooks/aws-parallelcluster-environment/resources/lustre/lustre_rocky8.rb b/cookbooks/aws-parallelcluster-environment/resources/lustre/lustre_rocky8.rb index a9bc8539b8..15f773fa05 100644 --- a/cookbooks/aws-parallelcluster-environment/resources/lustre/lustre_rocky8.rb +++ b/cookbooks/aws-parallelcluster-environment/resources/lustre/lustre_rocky8.rb @@ -25,13 +25,15 @@ action :setup do version = node['platform_version'] + log "Installing FSx for Lustre. Platform version: #{version}, kernel version: #{node['cluster']['kernel_release']}" if version.to_f < 8.2 log "FSx for Lustre is not supported in this Rocky Linux version #{version}, supported versions are >= 8.2" do level :warn end - # rhel8 kernel 4.18.0-425.3.1.el8 has broken kABI compat https://github.com/openzfs/zfs/issues/14724 - elsif node['cluster']['kernel_release'].include? "4.18.0-425.3.1.el8" - log "FSx for Lustre is not supported in kernel version 4.18.0-425.3.1.el8 of Rocky Linux, please update the kernel version" do + 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 + log "FSx for Lustre is not supported in kernel version #{node['cluster']['kernel_release']} of Rocky Linux, please update the kernel version" do level :warn end else diff --git a/cookbooks/aws-parallelcluster-environment/resources/system_authentication/system_authentication_rocky8.rb b/cookbooks/aws-parallelcluster-environment/resources/system_authentication/system_authentication_rocky8.rb index 1875ba9670..db4e6f7d0b 100644 --- a/cookbooks/aws-parallelcluster-environment/resources/system_authentication/system_authentication_rocky8.rb +++ b/cookbooks/aws-parallelcluster-environment/resources/system_authentication/system_authentication_rocky8.rb @@ -30,6 +30,7 @@ # authconfig is a compatibility tool, replaced by authselect command "authselect select sssd with-mkhomedir" sensitive true + default_env true end end diff --git a/kitchen.docker.yml b/kitchen.docker.yml index 94d6f80ff1..4eb76e76a6 100644 --- a/kitchen.docker.yml +++ b/kitchen.docker.yml @@ -75,4 +75,4 @@ platforms: attributes: cluster: base_os: rocky8 - kernel_release: '4.18.0-477.10.1.el8_8.x86_64' \ No newline at end of file + kernel_release: '4.18.0-477.10.1.el8_8.fake-value' diff --git a/test/environments/kitchen.rb b/test/environments/kitchen.rb index 04c2d5d35e..ec880d60b6 100644 --- a/test/environments/kitchen.rb +++ b/test/environments/kitchen.rb @@ -9,21 +9,25 @@ 'ebs_mount-vol_array/centos7' => '', 'ebs_mount-vol_array/ubuntu2004' => '', 'ebs_mount-vol_array/ubuntu2204' => '', + 'ebs_mount-vol_array/rocky8' => '', 'ebs_unmount-vol_array/alinux2' => '', 'ebs_unmount-vol_array/rhel8' => '', 'ebs_unmount-vol_array/centos7' => '', 'ebs_unmount-vol_array/ubuntu2004' => '', 'ebs_unmount-vol_array/ubuntu2204' => '', + 'ebs_unmount-vol_array/rocky8' => '', 'raid_mount-raid_vol_array/alinux2' => '', 'raid_mount-raid_vol_array/rhel8' => '', 'raid_mount-raid_vol_array/centos7' => '', 'raid_mount-raid_vol_array/ubuntu2004' => '', 'raid_mount-raid_vol_array/ubuntu2204' => '', + 'raid_mount-raid_vol_array/rocky8' => '', 'raid_unmount-raid_vol_array/alinux2' => '', 'raid_unmount-raid_vol_array/rhel8' => '', 'raid_unmount-raid_vol_array/centos7' => '', 'raid_unmount-raid_vol_array/ubuntu2004' => '', 'raid_unmount-raid_vol_array/ubuntu2204' => '', + 'raid_unmount-raid_vol_array/rocky8' => '', 'lustre_mount-fsx_fs_id_array' => ["fs-0ab11b3ade43091fe"], 'lustre_mount-fsx_dns_name_array' => ["fs-0ab11b3ade43091fe.fsx.us-west-2.amazonaws.com"], 'lustre_mount-fsx_mount_name_array' => ["qz5b7bev"],