From d28dc5f318960551b38247f8c6a88e52a43c4143 Mon Sep 17 00:00:00 2001
From: Helena Greebe <hgreebe@amazon.com>
Date: Thu, 15 Aug 2024 15:47:04 -0400
Subject: [PATCH] install pyxis in ami

---
 .../aws-parallelcluster-platform/recipes/config.rb |  1 -
 .../recipes/install.rb                             |  3 ++-
 .../resources/pyxis/partial/_pyxis_common.rb       | 14 +++++++-------
 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 e8b52b150..e867122af 100644
--- a/cookbooks/aws-parallelcluster-platform/recipes/config.rb
+++ b/cookbooks/aws-parallelcluster-platform/recipes/config.rb
@@ -29,4 +29,3 @@
 enroot "Configure enroot" do
   action :configure
 end
-pyxis 'Setup Pyxis'
diff --git a/cookbooks/aws-parallelcluster-platform/recipes/install.rb b/cookbooks/aws-parallelcluster-platform/recipes/install.rb
index e52de00d9..fc9fcc1cd 100644
--- a/cookbooks/aws-parallelcluster-platform/recipes/install.rb
+++ b/cookbooks/aws-parallelcluster-platform/recipes/install.rb
@@ -36,4 +36,5 @@
 include_recipe "aws-parallelcluster-platform::intel_mpi"
 arm_pl 'Install ARM Performance Library'
 intel_hpc 'Setup Intel HPC'
-enroot 'Setup Enroot'
\ No newline at end of file
+enroot 'Setup Enroot'
+pyxis 'Setup Pyxis'
\ No newline at end of file
diff --git a/cookbooks/aws-parallelcluster-platform/resources/pyxis/partial/_pyxis_common.rb b/cookbooks/aws-parallelcluster-platform/resources/pyxis/partial/_pyxis_common.rb
index b8709b8e5..c73af01c2 100644
--- a/cookbooks/aws-parallelcluster-platform/resources/pyxis/partial/_pyxis_common.rb
+++ b/cookbooks/aws-parallelcluster-platform/resources/pyxis/partial/_pyxis_common.rb
@@ -32,13 +32,13 @@
     ln -fs /usr/local/share/pyxis/pyxis.conf /opt/slurm/etc/plugstack.conf.d/pyxis.conf
 
     
-    # SHARED_DIR=#{node['cluster']['shared_dir']}
-    # NONROOT_USER=#{node['cluster']['cluster_user']}
-    # 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
+    SHARED_DIR=#{node['cluster']['shared_dir']}
+    NONROOT_USER=#{node['cluster']['cluster_user']}
+    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
     PYXIS_INSTALL
     retries 3
     retry_delay 5