Support Multiple EFS file systems

Signed-off-by: Hanwen <[email protected]>

Author: hanwen-cluster

attributes/default.rb

@@ -498,8 +498,8 @@
 default['cluster']['log_group_name'] = "NONE"
 default['cluster']['disable_hyperthreading_manually'] = 'false'
 default['cluster']['volume_fs_type'] = 'ext4'
-default['cluster']['efs_shared_dir'] = 'NONE'
-default['cluster']['efs_fs_id'] = nil
+default['cluster']['efs_shared_dirs'] = ''
+default['cluster']['efs_fs_ids'] = ''
 default['cluster']['cluster_admin_user'] = 'pcluster-admin'
 default['cluster']['cluster_admin_user_id'] = node['cluster']['reserved_base_uid']
 default['cluster']['cluster_admin_group'] = node['cluster']['cluster_admin_user']

cookbooks/aws-parallelcluster-config/recipes/efs_mount.rb

@@ -16,11 +16,10 @@
 # limitations under the License.
 
 # Get shared_dir path and mount EFS filesystem
-efs_shared_dir =  node['cluster']['efs_shared_dir'].split(',')[0]
-
-# Check to see if EFS is created
-if efs_shared_dir != "NONE"
 
+efs_fs_id_array = node['cluster']['efs_fs_ids'].split(',')
+efs_shared_dir_array = node['cluster']['efs_shared_dirs'].split(',')
+efs_fs_id_array.zip(efs_shared_dir_array).each do |efs_fs_id, efs_shared_dir|
   # Path needs to be fully qualified, for example "shared/temp" becomes "/shared/temp"
   efs_shared_dir = "/#{efs_shared_dir}" unless efs_shared_dir.start_with?('/')
 
@@ -35,7 +34,7 @@
 
   # Mount EFS over NFS
   mount efs_shared_dir do
-    device "#{node['cluster']['efs_fs_id']}.efs.#{node['cluster']['region']}.#{node['cluster']['aws_domain']}:/"
+    device "#{efs_fs_id}.efs.#{node['cluster']['region']}.#{node['cluster']['aws_domain']}:/"
     fstype 'nfs4'
     options 'nfsvers=4.1,rsize=1048576,wsize=1048576,hard,timeo=30,retrans=2,noresvport,_netdev'
     dump 0

system_tests/dna.json

@@ -10,8 +10,8 @@
     "postinstall": "NONE",
     "postinstall_args": "NONE",
     "region": "us-east-2",
-    "efs_fs_id": "NONE",
-    "efs_shared_dir": "NONE,NONE,NONE,NONE,NONE,NONE,NONE,NONE,NONE",
+    "efs_fs_ids": "",
+    "efs_shared_dirs": "",
     "fsx_fs_id": "NONE",
     "fsx_mount_name": "",
     "fsx_dns_name": "",