Revert workarounds for EFA installer issue

Revert "2.11: Update changelog"

This reverts commit acb1ba0.

Revert "Fix uninstall efa deps"

This reverts commit 76bdb55.

Revert "Remove rdma-core before EFA installation only on alinux2"

This reverts commit 8e6c33f.

Revert "Implement workaround for EFA installer issue"

This reverts commit 1a52d00.

Author: Tim Lane

CHANGELOG.md

@@ -15,7 +15,6 @@ This file is used to list changes made in each version of the AWS ParallelCluste
 
 **BUG FIXES**
 - Lock the version of ``nvidia-fabricmanager`` package to the installed NVIDIA drivers to prevent updates and misalignments.
-- Fix EFA runtime installation on alinux2 when GPUDirect RDMA is enabled, by uninstalling ``rdma-core`` before installing EFA.
 
 2.11.1
 -----

recipes/efa_install.rb

@@ -47,15 +47,6 @@
   end
 end
 
-# Remove certain dependencies before installation to
-# work around an issue with the EFA installer.
-# Without the removal, runtime re-installation of EFA would fail on alinux2.
-package 'uninstall efa deps before installing efa' do
-  action :remove
-  package_name %w[rdma-core]
-  only_if { (!efa_installed || efa_gdr_enabled?) && node['platform_family'] == 'amazon' }
-end
-
 installer_options = "-y"
 # skip efa-kmod installation on not supported platforms
 installer_options += " -k" unless node['conditions']['efa_supported']
@@ -71,7 +62,7 @@
     ./efa_installer.sh #{installer_options}
     rm -rf #{node['cfncluster']['sources_dir']}/aws-efa-installer
   EFAINSTALL
-  only_if { !efa_installed || efa_gdr_enabled? }
+  not_if { efa_installed && !efa_gdr_enabled? }
 end
 
 # EFA installer v1.11.0 removes libibverbs-core, which contains hwloc-devel during install