Use EFS id instead of DNS in fstab

According to https://docs.aws.amazon.com/efs/latest/ug/mounting-fs-mount-helper-ec2-linux.html, EFS can be mounted both with EFS id and DNS. Starting from aws#1588, we use a mixture of two approach. To improve consistency in the code style, this commit uses EFS id instead of DNS in fstab Signed-off-by: Hanwen <[email protected]>
hanwen-pcluste · Dec 1, 2023 · a491716 · a491716
1 parent 54d1ec6
commit a491716
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/cookbooks/aws-parallelcluster-environment/resources/efs/partial/_mount_umount.rb b/cookbooks/aws-parallelcluster-environment/resources/efs/partial/_mount_umount.rb
@@ -72,7 +72,7 @@
 
     # Enable the mount dir
     mount efs_shared_dir do
-      device "#{efs_fs_id}.efs.#{node['cluster']['region']}.#{node['cluster']['aws_domain']}:#{mount_point}"
+      device "#{efs_fs_id}:#{mount_point}"
       fstype 'efs'
       options mount_options
       dump 0

diff --git a/cookbooks/aws-parallelcluster-environment/spec/unit/resources/efs_spec.rb b/cookbooks/aws-parallelcluster-environment/spec/unit/resources/efs_spec.rb
@@ -297,7 +297,7 @@ def mock_already_installed(package, expected_version, installed)
 
         it 'enables shared dir mount if already mounted' do
           is_expected.to enable_mount('/shared_dir_2')
-            .with(device: 'id_2.efs.REGION.DOMAIN:/')
+            .with(device: 'id_2:/')
             .with(fstype: 'efs')
             .with(dump: 0)
             .with(pass: 0)
@@ -306,7 +306,7 @@ def mock_already_installed(package, expected_version, installed)
             .with(retry_delay: 6)
 
           is_expected.to enable_mount('/shared_dir_3')
-            .with(device: 'id_3.efs.REGION.DOMAIN:/')
+            .with(device: 'id_3:/')
             .with(fstype: 'efs')
             .with(dump: 0)
             .with(pass: 0)