From b593e11a86236b26acebab4210fb8a98b588c87c Mon Sep 17 00:00:00 2001 From: Himani Anil Deshpande <79726937+himani2411@users.noreply.github.com> Date: Tue, 18 Mar 2025 16:01:36 -0400 Subject: [PATCH] [Ubuntu24] Install Lustre client for Ubuntu24 (#2912) Co-authored-by: Himani Anil Deshpande --- CHANGELOG.md | 1 - .../resources/lustre/partial/_install_lustre_debian.rb | 1 - .../test/controls/lustre_spec.rb | 10 +++++----- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 39c192d440..be8694657e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,6 @@ This file is used to list changes made in each version of the AWS ParallelCluste ------ **ENHANCEMENTS** - Add support for Ubuntu 24.04. - Notice that ParallelCluster official AMI for Ubuntu 24.04 does not support Lustre. - Disable unused services like cups and wpa_supplicant from Official ParallelCluster AMIs to improve security. **CHANGES** diff --git a/cookbooks/aws-parallelcluster-environment/resources/lustre/partial/_install_lustre_debian.rb b/cookbooks/aws-parallelcluster-environment/resources/lustre/partial/_install_lustre_debian.rb index 13a797c7f8..78a7b13149 100644 --- a/cookbooks/aws-parallelcluster-environment/resources/lustre/partial/_install_lustre_debian.rb +++ b/cookbooks/aws-parallelcluster-environment/resources/lustre/partial/_install_lustre_debian.rb @@ -14,7 +14,6 @@ # See the License for the specific language governing permissions and limitations under the License. action :setup do - return if node['platform_version'].to_i == 24 apt_repository 'fsxlustreclientrepo' do uri "https://fsx-lustre-client-repo.s3.amazonaws.com/ubuntu" components ['main'] diff --git a/cookbooks/aws-parallelcluster-environment/test/controls/lustre_spec.rb b/cookbooks/aws-parallelcluster-environment/test/controls/lustre_spec.rb index ef15c538d5..0d1f5b707d 100644 --- a/cookbooks/aws-parallelcluster-environment/test/controls/lustre_spec.rb +++ b/cookbooks/aws-parallelcluster-environment/test/controls/lustre_spec.rb @@ -27,7 +27,7 @@ end end - if os_properties.redhat? && inspec.os.release.to_f >= 8.2 && !os_properties.on_docker? && !os_properties.ubuntu2404? + if os_properties.redhat? && inspec.os.release.to_f >= 8.2 && !os_properties.on_docker? # TODO: restore installation and check on docker when Lustre is available for RH8.9 # See: https://docs.aws.amazon.com/fsx/latest/LustreGuide/install-lustre-client.html unless inspec.os.release.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")) @@ -55,7 +55,7 @@ end end - if os_properties.debian_family? && !os_properties.ubuntu2404? + if os_properties.debian_family? describe apt('https://fsx-lustre-client-repo.s3.amazonaws.com/ubuntu') do it { should exist } it { should be_enabled } @@ -89,7 +89,7 @@ control 'tag:install_lustre_lnet_kernel_module_enabled' do title "Verify that lnet kernel module is enabled" - only_if { !os_properties.on_docker? && !os_properties.alinux? && !os_properties.ubuntu2404? } + only_if { !os_properties.on_docker? && !os_properties.alinux? } describe kernel_module("lnet") do it { should be_loaded } it { should_not be_disabled } @@ -98,7 +98,7 @@ end control 'lustre_mounted' do - only_if { !os_properties.on_docker? && !os_properties.ubuntu2404? } + only_if { !os_properties.on_docker? } describe mount('/shared_dir') do it { should be_mounted } its('type') { should eq 'lustre' } @@ -106,7 +106,7 @@ end control 'lustre_unmounted' do - only_if { !os_properties.on_docker? && !os_properties.ubuntu2404? } + only_if { !os_properties.on_docker? } describe mount('/shared_dir') do it { should_not be_mounted }