From 60f8c7c049a066f2eada76d58f749abc64af2f8f Mon Sep 17 00:00:00 2001
From: Helena Greebe <hgreebe@amazon.com>
Date: Thu, 10 Oct 2024 11:55:24 -0400
Subject: [PATCH] Remove pyxis config parts

---
 .../aws-parallelcluster-platform/recipes/config.rb     |  6 +++---
 .../resources/enroot/partial/_enroot_common.rb         | 10 +++++-----
 .../recipes/install/install_pyxis.rb                   |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cookbooks/aws-parallelcluster-platform/recipes/config.rb b/cookbooks/aws-parallelcluster-platform/recipes/config.rb
index b385e48ec..af2a2c704 100644
--- a/cookbooks/aws-parallelcluster-platform/recipes/config.rb
+++ b/cookbooks/aws-parallelcluster-platform/recipes/config.rb
@@ -26,6 +26,6 @@
 include_recipe 'aws-parallelcluster-platform::supervisord_config'
 fetch_config 'Fetch and load cluster configs'
 include_recipe 'aws-parallelcluster-platform::config_login' if node['cluster']['node_type'] == 'LoginNode'
-# enroot 'Configure Enroot' do
-#   action :configure
-# end
+enroot 'Configure Enroot' do
+  action :configure
+end
diff --git a/cookbooks/aws-parallelcluster-platform/resources/enroot/partial/_enroot_common.rb b/cookbooks/aws-parallelcluster-platform/resources/enroot/partial/_enroot_common.rb
index 54a71a03d..8f5be68f5 100644
--- a/cookbooks/aws-parallelcluster-platform/resources/enroot/partial/_enroot_common.rb
+++ b/cookbooks/aws-parallelcluster-platform/resources/enroot/partial/_enroot_common.rb
@@ -53,11 +53,11 @@
 
       chmod 1777 ${SHARED_DIR}/enroot
 
-      mkdir -p ${SHARED_DIR}/pyxis/
-      chown ${NONROOT_USER} ${SHARED_DIR}/pyxis/
-      sed -i '${s/$/ runtime_path=${SHARED_DIR}\\/pyxis/}' /opt/slurm/etc/plugstack.conf.d/pyxis.conf
-      SHARED_DIR=${SHARED_DIR} envsubst < /opt/slurm/etc/plugstack.conf.d/pyxis.conf > /opt/slurm/etc/plugstack.conf.d/pyxis.tmp.conf
-      mv /opt/slurm/etc/plugstack.conf.d/pyxis.tmp.conf /opt/slurm/etc/plugstack.conf.d/pyxis.conf
+      # mkdir -p ${SHARED_DIR}/pyxis/
+      # chown ${NONROOT_USER} ${SHARED_DIR}/pyxis/
+      # sed -i '${s/$/ runtime_path=${SHARED_DIR}\\/pyxis/}' /opt/slurm/etc/plugstack.conf.d/pyxis.conf
+      # SHARED_DIR=${SHARED_DIR} envsubst < /opt/slurm/etc/plugstack.conf.d/pyxis.conf > /opt/slurm/etc/plugstack.conf.d/pyxis.tmp.conf
+      # mv /opt/slurm/etc/plugstack.conf.d/pyxis.tmp.conf /opt/slurm/etc/plugstack.conf.d/pyxis.conf
 
     ENROOT_CONFIGURE
     retries 3
diff --git a/cookbooks/aws-parallelcluster-slurm/recipes/install/install_pyxis.rb b/cookbooks/aws-parallelcluster-slurm/recipes/install/install_pyxis.rb
index 42785b11a..18d2f84d6 100644
--- a/cookbooks/aws-parallelcluster-slurm/recipes/install/install_pyxis.rb
+++ b/cookbooks/aws-parallelcluster-slurm/recipes/install/install_pyxis.rb
@@ -39,7 +39,7 @@
     CPPFLAGS='-I /opt/slurm/include/' make install
     mkdir -p /opt/slurm/etc/plugstack.conf.d
     echo -e 'include /opt/slurm/etc/plugstack.conf.d/*' | tee /opt/slurm/etc/plugstack.conf
-    ln -fs /usr/local/share/pyxis/pyxis.conf /opt/slurm/etc/plugstack.conf.d/pyxis.conf
+    # ln -fs /usr/local/share/pyxis/pyxis.conf /opt/slurm/etc/plugstack.conf.d/pyxis.conf
   PYXIS_INSTALL
   retries 3
   retry_delay 5