Refactor mount share storages recipes and create mount share storage resources

Create mount share storage resources so they can be reused to support update share storages and support adding unmount action for resource

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

Author: chenwany

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

@@ -90,11 +90,8 @@
   mode '0644'
 end
 
-# Mount EFS directory with efs_mount recipe
-include_recipe 'aws-parallelcluster-config::efs_mount'
-
-# Mount FSx directory with fsx_mount recipe
-include_recipe 'aws-parallelcluster-config::fsx_mount'
+# Mount EFS, FSx
+include_recipe "aws-parallelcluster-config::fs_mount"
 
 # Intel Runtime Libraries
 include_recipe "aws-parallelcluster-config::intel"

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

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+#
+# Cookbook:: aws-parallelcluster
+# Recipe:: fs_mount
+#
+# Copyright:: 2013-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the
+# License. A copy of the License is located at
+#
+# http://aws.amazon.com/apache2.0/
+#
+# or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Mount EFS directory with mount_efs resource
+mount_efs "efs" do
+  shared_dir_array node['cluster']['efs_shared_dirs'].split(',')
+  vol_array node['cluster']['efs_fs_ids'].split(',')
+end
+
+# Mount FSx directory with mount_fsx resource
+mount_fsx "fsx" do
+  fsx_fs_id_array node['cluster']['fsx_fs_ids'].split(',')
+  fsx_fs_type_array node['cluster']['fsx_fs_types'].split(',')
+  fsx_shared_dir_array node['cluster']['fsx_shared_dirs'].split(',')
+  fsx_dns_name_array node['cluster']['fsx_dns_names'].split(',')
+  fsx_mount_name_array node['cluster']['fsx_mount_names'].split(',')
+  fsx_volume_junction_path_array node['cluster']['fsx_volume_junction_paths'].split(',')
+end

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

@@ -15,97 +15,10 @@
 # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Parse shared directory info and turn into an array
-shared_dir_array = node['cluster']['ebs_shared_dirs'].split(',')
-shared_dir_array.each_with_index do |dir, index|
-  shared_dir_array[index] = dir.strip
-  shared_dir_array[index] = "/#{shared_dir_array[index]}" unless shared_dir_array[index].start_with?('/')
-end
-
-# Parse volume info into an arary
-vol_array = node['cluster']['volume'].split(',')
-vol_array.each_with_index do |vol, index|
-  vol_array[index] = vol.strip
-end
-
-# Mount each volume
-dev_path = [] # device labels
-dev_uuids = [] # device uuids
-
-vol_array.each_with_index do |volumeid, index|
-  dev_path[index] = "/dev/disk/by-ebs-volumeid/#{volumeid}"
-
-  # Attach EBS volume
-  execute "attach_volume_#{index}" do
-    command "#{node.default['cluster']['cookbook_virtualenv_path']}/bin/python /usr/local/sbin/attachVolume.py #{volumeid}"
-    creates dev_path[index]
-  end
-
-  # wait for the drive to attach, before making a filesystem
-  ruby_block "sleeping_for_volume_#{index}" do
-    block do
-      wait_for_block_dev(dev_path[index])
-    end
-    action :nothing
-    subscribes :run, "execute[attach_volume_#{index}]", :immediately
-  end
-
-  # Setup disk, will be formatted xfs if empty
-  ruby_block "setup_disk_#{index}" do
-    block do
-      pt_type = get_pt_type(dev_path[index])
-      if pt_type.nil?
-        Chef::Log.info("device #{dev_path[index]} not partitioned, mounting directly")
-        fs_type = setup_disk(dev_path[index])
-      else
-        # Partitioned device, mount 1st partition
-        Chef::Log.info("device #{dev_path[index]} partitioned, mounting first partition")
-        partition_dev = get_1st_partition(dev_path[index])
-        Chef::Log.info("First partition for device #{dev_path[index]} is: #{partition_dev}")
-        fs_type = get_fs_type(partition_dev)
-        dev_path[index] = partition_dev
-      end
-      node.default['cluster']['volume_fs_type'] = fs_type
-      dev_uuids[index] = get_uuid(dev_path[index])
-    end
-    action :nothing
-    subscribes :run, "ruby_block[sleeping_for_volume_#{index}]", :immediately
-  end
-
-  # Create the shared directories
-  directory shared_dir_array[index] do
-    owner 'root'
-    group 'root'
-    mode '1777'
-    recursive true
-    action :create
-  end
-
-  # Add volume to /etc/fstab
-  mount shared_dir_array[index] do
-    device(DelayedEvaluator.new { dev_uuids[index] })
-    fstype(DelayedEvaluator.new { node['cluster']['volume_fs_type'] })
-    device_type :uuid
-    options "_netdev"
-    pass 0
-    action %i(mount enable)
-    retries 10
-    retry_delay 6
-  end
-
-  # Make sure shared directory permissions are correct
-  directory shared_dir_array[index] do
-    owner 'root'
-    group 'root'
-    mode '1777'
-  end
-
-  # Export shared dir
-  nfs_export shared_dir_array[index] do
-    network get_vpc_cidr_list
-    writeable true
-    options ['no_root_squash']
-  end
+manage_ebs "ebs" do
+  shared_dir_array node['cluster']['ebs_shared_dirs'].split(',')
+  vol_array node['cluster']['volume'].split(',')
+  action %i(mount export)
 end
 
 # Export /home