Skip to content

Commit 364500b

Browse files
Use the latest version of amazon-efs-utils and move to 2.x
1 parent 2b32e47 commit 364500b

File tree

8 files changed

+11
-15
lines changed

8 files changed

+11
-15
lines changed

cookbooks/aws-parallelcluster-environment/resources/efs/efs_alinux2.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
use 'partial/_mount_umount'
2020

2121
action :install_utils do
22-
package_name = "amazon-efs-utils"
22+
package_name = "amazon-efs-utils-#{new_resource.efs_utils_version}"
2323

2424
# Do not install efs-utils if a same or newer version is already installed.
2525
return if already_installed?(package_name, new_resource.efs_utils_version)

cookbooks/aws-parallelcluster-environment/resources/efs/efs_alinux2023.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
use 'partial/_mount_umount'
2222

2323
action :install_utils do
24-
package_name = "amazon-efs-utils"
24+
package_name = "amazon-efs-utils-#{new_resource.efs_utils_version}"
2525

2626
# Do not install efs-utils if a same or newer version is already installed.
2727
return if already_installed?(package_name, new_resource.efs_utils_version)

cookbooks/aws-parallelcluster-environment/resources/efs/efs_redhat8.rb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,3 @@
2121
use 'partial/_redhat_based'
2222
use 'partial/_install_from_tar'
2323
use 'partial/_mount_umount'
24-
25-
def prerequisites
26-
%w(rpm-build make)
27-
end

cookbooks/aws-parallelcluster-environment/resources/efs/efs_rocky8.rb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,3 @@
2121
use 'partial/_redhat_based'
2222
use 'partial/_install_from_tar'
2323
use 'partial/_mount_umount'
24-
25-
def prerequisites
26-
%w(rpm-build make)
27-
end

cookbooks/aws-parallelcluster-environment/resources/efs/partial/_common.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
default_action :install_utils
44

5-
property :efs_utils_version, String, default: '1.34.1'
6-
property :efs_utils_checksum, String, default: '69d0d8effca3b58ccaf4b814960ec1d16263807e508b908975c2627988c7eb6c'
5+
property :efs_utils_version, String, default: '2.1.0'
6+
property :efs_utils_checksum, String, default: '2996bdd5387131d302310812fa1e07e1be00f80814a580f5dfeb27d68519fd24'
77

88
def already_installed?(package_name, expected_version)
99
Gem::Version.new(get_package_version(package_name)) >= Gem::Version.new(expected_version)

cookbooks/aws-parallelcluster-environment/resources/efs/partial/_debian.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ def install_script_code(efs_utils_tarball, efs_utils_package, efs_utils_version)
2424
end
2525

2626
def prerequisites
27-
%w(dkms)
27+
%w(dkms rust cargo)
2828
end

cookbooks/aws-parallelcluster-environment/resources/efs/partial/_redhat_based.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,7 @@ def install_script_code(efs_utils_tarball, efs_utils_package, efs_utils_version)
2222
yum -y install ./build/#{efs_utils_package}*rpm
2323
EFSUTILSINSTALL
2424
end
25+
26+
def prerequisites
27+
%w(rpm-build make rust cargo)
28+
end

cookbooks/aws-parallelcluster-environment/test/controls/efs_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
only_if { !os_properties.redhat_on_docker? }
66

7-
describe file("#{node['cluster']['sources_dir']}/efs-utils-1.34.1.tar.gz") do
7+
describe file("#{node['cluster']['sources_dir']}/efs-utils-2.1.0.tar.gz") do
88
it { should exist }
9-
its('sha256sum') { should eq '69d0d8effca3b58ccaf4b814960ec1d16263807e508b908975c2627988c7eb6c' }
9+
its('sha256sum') { should eq '2996bdd5387131d302310812fa1e07e1be00f80814a580f5dfeb27d68519fd24' }
1010
its('owner') { should eq 'root' }
1111
its('group') { should eq 'root' }
1212
its('mode') { should cmp '0644' }

0 commit comments

Comments
 (0)