From 3c05a5b4c6ad5c9c519c47e92b6ae5d4e0851bf8 Mon Sep 17 00:00:00 2001
From: Helena Greebe <hgreebe@amazon.com>
Date: Thu, 15 Aug 2024 16:18:11 -0400
Subject: [PATCH] split pyxis

---
 .../aws-parallelcluster-platform/recipes/config.rb  |  3 +++
 .../resources/pyxis/partial/_pyxis_common.rb        | 13 ++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/cookbooks/aws-parallelcluster-platform/recipes/config.rb b/cookbooks/aws-parallelcluster-platform/recipes/config.rb
index e867122af..3a1f058fc 100644
--- a/cookbooks/aws-parallelcluster-platform/recipes/config.rb
+++ b/cookbooks/aws-parallelcluster-platform/recipes/config.rb
@@ -29,3 +29,6 @@
 enroot "Configure enroot" do
   action :configure
 end
+pyxis "Configure pyxis" do
+  action :configure
+end
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 c73af01c2..79b6dddb0 100644
--- a/cookbooks/aws-parallelcluster-platform/resources/pyxis/partial/_pyxis_common.rb
+++ b/cookbooks/aws-parallelcluster-platform/resources/pyxis/partial/_pyxis_common.rb
@@ -30,8 +30,19 @@
     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
+    PYXIS_INSTALL
+    retries 3
+    retry_delay 5
+  end
+end
 
-    
+
+action :configure do
+
+  bash "Configure pyxis" do
+    user 'root'
+    code <<-PYXIS_INSTALL
+    set -e
     SHARED_DIR=#{node['cluster']['shared_dir']}
     NONROOT_USER=#{node['cluster']['cluster_user']}
     mkdir -p ${SHARED_DIR}/pyxis/