Add pyxis again

hgreebe · Aug 15, 2024 · 6664ff0 · 6664ff0
1 parent e57a3cd
commit 6664ff0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/cookbooks/aws-parallelcluster-platform/recipes/config.rb b/cookbooks/aws-parallelcluster-platform/recipes/config.rb
@@ -29,4 +29,4 @@
 enroot "Configure enroot" do
   action :configure
 end
-#pyxis 'Setup Pyxis'
+pyxis 'Setup Pyxis'
diff --git a/cookbooks/aws-parallelcluster-platform/resources/pyxis/partial/_pyxis_common.rb b/cookbooks/aws-parallelcluster-platform/resources/pyxis/partial/_pyxis_common.rb
@@ -31,10 +31,13 @@
     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
 
-    mkdir -p #{node['cluster']['shared_dir']}/pyxis/
-    chown #{node['cluster']['cluster_user']} #{node['cluster']['shared_dir']}/pyxis/
-    sed -i '${s/$/ runtime_path=#{node['cluster']['shared_dir']}\/pyxis/}' /opt/slurm/etc/plugstack.conf.d/pyxis.conf
-    SHARED_DIR=#{node['cluster']['shared_dir']} envsubst < /opt/slurm/etc/plugstack.conf.d/pyxis.conf > /opt/slurm/etc/plugstack.conf.d/pyxis.tmp.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