Revert "Convert EFA installation recipe into a resource"

This reverts commit 7108f89

Signed-off-by: Enrico Usai <[email protected]>

Author: enrico-usai

cookbooks/aws-parallelcluster-install/libraries/helpers.rb

@@ -90,13 +90,3 @@ def append_if_not_present_grub_cmdline(attributes, grub_variable)
     end
   end
 end
-
-def efa_installed?
-  dir_exist = ::Dir.exist?('/opt/amazon/efa')
-  if dir_exist
-    modinfo_efa_stdout = Mixlib::ShellOut.new("modinfo efa").run_command.stdout
-    efa_installed_packages_file = Mixlib::ShellOut.new("cat /opt/amazon/efa_installed_packages").run_command.stdout
-    Chef::Log.info("`/opt/amazon/efa` directory already exists. \nmodinfo efa stdout: \n#{modinfo_efa_stdout} \nefa_installed_packages_file_content: \n#{efa_installed_packages_file}")
-  end
-  dir_exist
-end

cookbooks/aws-parallelcluster-install/recipes/efa.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+#
+# Cookbook:: aws-parallelcluster
+# Recipe:: efa
+#
+# Copyright:: 2013-2021 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.
+
+efa_tarball = "#{node['cluster']['sources_dir']}/aws-efa-installer.tar.gz"
+efa_installed = efa_installed?
+
+if efa_installed && !::File.exist?(efa_tarball)
+  Chef::Log.warn("Existing EFA version differs from the one shipped with ParallelCluster. Skipping ParallelCluster EFA installation and configuration.")
+  return
+end
+
+# Get EFA Installer
+remote_file efa_tarball do
+  source node['cluster']['efa']['installer_url']
+  mode '0644'
+  retries 3
+  retry_delay 5
+  not_if { ::File.exist?(efa_tarball) }
+end
+
+# default openmpi installation conflicts with new install
+# new one is installed in /opt/amazon/efa/bin/
+case node['platform_family']
+when 'rhel', 'amazon'
+  package %w(openmpi-devel openmpi) do
+    action :remove
+    not_if { efa_installed }
+  end
+when 'debian'
+  package "libopenmpi-dev" do
+    action :remove
+    not_if { efa_installed }
+  end
+end
+
+installer_options = "-y"
+# skip efa-kmod installation on not supported platforms
+installer_options += " -k" unless node['conditions']['efa_supported']
+
+bash "install efa" do
+  cwd node['cluster']['sources_dir']
+  code <<-EFAINSTALL
+    set -e
+    tar -xzf #{efa_tarball}
+    cd aws-efa-installer
+    ./efa_installer.sh #{installer_options}
+    rm -rf #{node['cluster']['sources_dir']}/aws-efa-installer
+  EFAINSTALL
+  not_if { efa_installed }
+end

cookbooks/aws-parallelcluster-install/recipes/install.rb

@@ -31,9 +31,9 @@
 include_recipe "aws-parallelcluster-install::cloudwatch_agent"
 include_recipe "aws-parallelcluster-install::arm_pl" # ARM Performance Library
 include_recipe "aws-parallelcluster-install::intel_hpc" # Intel HPC libraries
-efa 'Install EFA'
 
 # == ENVIRONMENT
+include_recipe "aws-parallelcluster-install::efa" unless virtualized?
 include_recipe "aws-parallelcluster-install::lustre" # FSx options
 include_recipe "aws-parallelcluster-install::efs" # EFS Utils
 

cookbooks/aws-parallelcluster-install/resources/efa/efa.rb

@@ -82,16 +82,3 @@ suites:
         - recipe:aws-parallelcluster::test_dummy
         - recipe:aws-parallelcluster-install::directories
       resource: mysql_client
-  - name: efa
-    run_list:
-      - recipe[aws-parallelcluster::add_dependencies]
-      - recipe[aws-parallelcluster-install::test_resource]
-    verifier:
-      controls:
-        - efa_conflicting_packages_removed
-        - efa_installed
-    attributes:
-      resource: efa
-      dependencies:
-        - recipe:aws-parallelcluster::test_dummy
-        - recipe:aws-parallelcluster-install::directories

kitchen.resources.yml

@@ -49,6 +49,4 @@ suites:
         - package_repos
         - install_packages
         - nfs
-        - efa_conflicting_packages_removed
-        - efa_installed
 

kitchen.validate.yml

@@ -499,6 +499,16 @@ def kitchen_test?
   node['kitchen'] == 'true'
 end
 
+def efa_installed?
+  dir_exist = ::Dir.exist?('/opt/amazon/efa')
+  if dir_exist
+    modinfo_efa_stdout = Mixlib::ShellOut.new("modinfo efa").run_command.stdout
+    efa_installed_packages_file = Mixlib::ShellOut.new("cat /opt/amazon/efa_installed_packages").run_command.stdout
+    Chef::Log.info("`/opt/amazon/efa` directory already exists. \nmodinfo efa stdout: \n#{modinfo_efa_stdout} \nefa_installed_packages_file_content: \n#{efa_installed_packages_file}")
+  end
+  dir_exist
+end
+
 # load cluster configuration file into node object
 def load_cluster_config
   ruby_block "load cluster configuration" do