[Efs-utils] Add efs-utils attributes

Author: Himani Anil Deshpande

cookbooks/aws-parallelcluster-environment/attributes/environment.rb

@@ -73,6 +73,11 @@
 default['cluster']['efa']['version'] = '1.41.0'
 default['cluster']['efa']['sha256'] = '3506354cdfbe31ff552fe75f5d0d9bb7efd29cf79bd99457347d29c751c38f9f'
 
+default['cluster']['efs']['version'] = '2.3.1'
+default['cluster']['efs']['sha256'] = 'ced12f82e76f9740476b63f30c49bd76cc00b6375e12a9f5f7ba852635c49e15'
+if platform?('amazon')
+  default['cluster']['efs']['version'] = '2.1.0'
+end
 # TODO: Move to platform cookbook
 default['cluster']['spack_shared_dir'] = "#{node['cluster']['shared_dir']}/spack"
 default['cluster']['spack']['version'] = '0.20.2'

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

@@ -18,13 +18,11 @@
 use 'partial/_common'
 use 'partial/_mount_umount'
 
-property :efs_utils_version, String, default: '2.1.0'
-
 action :install_utils do
   package_name = "amazon-efs-utils"
-  full_package = "#{package_name}-#{new_resource.efs_utils_version}"
+  full_package = "#{package_name}-#{_efs_utils_version}"
   # Do not install efs-utils if a same or newer version is already installed.
-  return if already_installed?(package_name, new_resource.efs_utils_version)
+  return if already_installed?(package_name, _efs_utils_version)
 
   # On Amazon Linux 2, amazon-efs-utils and stunnel are installed from OS repo.
   package full_package do

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

@@ -20,13 +20,11 @@
 use 'partial/_common'
 use 'partial/_mount_umount'
 
-property :efs_utils_version, String, default: '2.1.0'
-
 action :install_utils do
-  package_name = "amazon-efs-utils-#{new_resource.efs_utils_version}"
+  package_name = "amazon-efs-utils-#{_efs_utils_version}"
 
   # Do not install efs-utils if a same or newer version is already installed.
-  return if already_installed?(package_name, new_resource.efs_utils_version)
+  return if already_installed?(package_name, _efs_utils_version)
 
   # On Amazon Linux 2, amazon-efs-utils and stunnel are installed from OS repo.
   package package_name do

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

@@ -2,8 +2,16 @@
 
 default_action :install_utils
 
-property :efs_utils_version, String, default: '2.3.1'
-property :efs_utils_checksum, String, default: 'ced12f82e76f9740476b63f30c49bd76cc00b6375e12a9f5f7ba852635c49e15'
+property :efs_utils_version, String
+property :efs_utils_checksum, String
+
+def _efs_utils_version
+  efs_utils_version || node['cluster']['efs']['version']
+end
+
+def _efs_utils_checksum
+  efs_utils_checksum || node['cluster']['efs']['sha256']
+end
 
 def already_installed?(package_name, expected_version)
   Gem::Version.new(get_package_version(package_name)) >= Gem::Version.new(expected_version)

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

@@ -30,7 +30,7 @@
   return if redhat_on_docker?
 
   package_name = "amazon-efs-utils"
-  package_version = new_resource.efs_utils_version
+  package_version = _efs_utils_version
   efs_utils_tarball = "#{node['cluster']['sources_dir']}/efs-utils-#{package_version}.tar.gz"
   efs_utils_url = "#{node['cluster']['artifacts_s3_url']}/dependencies/efs/v#{package_version}.tar.gz"
 
@@ -46,7 +46,7 @@
     mode '0644'
     retries 3
     retry_delay 5
-    checksum new_resource.efs_utils_checksum
+    checksum _efs_utils_checksum
     action :create_if_missing
   end