Skip to content

Commit 96f923f

Browse files
author
Himani Anil Deshpande
committed
[Isolated] Remove use of new_resource as this will be empty without a default value set
1 parent a3d8a4a commit 96f923f

File tree

3 files changed

+7
-10
lines changed

3 files changed

+7
-10
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def prerequisites
4242

4343
action :install_efs_utils do
4444
package_name = "amazon-efs-utils"
45-
package_version = new_resource.efs_utils_version
45+
package_version = _efs_utils_version
4646
efs_utils_tarball = "#{node['cluster']['sources_dir']}/efs-utils-#{package_version}.tar.gz"
4747

4848
if aws_region.start_with?("us-iso")

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

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

33
default_action :install_utils
44

5-
property :efs_utils_version, String
6-
property :efs_utils_checksum, String
7-
85
def _efs_utils_version
9-
efs_utils_version || node['cluster']['efs']['version']
6+
node['cluster']['efs']['version']
107
end
118

129
def _efs_utils_checksum
13-
efs_utils_checksum || node['cluster']['efs']['sha256']
10+
node['cluster']['efs']['sha256']
1411
end
1512

1613
def already_installed?(package_name, expected_version)

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
package_name = "amazon-efs-utils"
1616

1717
action :install_utils do
18-
package_version = new_resource.efs_utils_version
18+
package_version = _efs_utils_version
1919
efs_utils_tarball = "#{node['cluster']['sources_dir']}/efs-utils-#{package_version}.tar.gz"
2020
efs_utils_url = "#{node['cluster']['artifacts_s3_url']}/dependencies/efs/v#{package_version}.tar.gz"
2121

@@ -46,7 +46,7 @@
4646
mode '0644'
4747
retries 3
4848
retry_delay 5
49-
checksum new_resource.efs_utils_checksum
49+
checksum _efs_utils_checksum
5050
action :create_if_missing
5151
end
5252

@@ -61,9 +61,9 @@
6161
end
6262

6363
action :install_efs_utils do
64-
package_version = new_resource.efs_utils_version
64+
package_version = _efs_utils_version
6565
efs_utils_tarball = "#{node['cluster']['sources_dir']}/efs-utils-#{package_version}.tar.gz"
66-
66+
# Install EFS Utils following https://docs.aws.amazon.com/efs/latest/ug/installing-amazon-efs-utils.html
6767
bash "install efs utils" do
6868
cwd node['cluster']['sources_dir']
6969
code install_script_code(efs_utils_tarball, package_name, package_version)

0 commit comments

Comments
 (0)