Move enroot configuration to cluster creation stage

aws · Aug 22, 2024 · 8402979 · 8402979
1 parent 98140a5
commit 8402979
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/cookbooks/aws-parallelcluster-platform/attributes/platform.rb b/cookbooks/aws-parallelcluster-platform/attributes/platform.rb
@@ -11,7 +11,7 @@
 
 # Enroot + Pyxis
 default['cluster']['enroot']['version'] = '3.4.1'
-default['cluster']['pyxis']['version'] = 'v0.19.0'
+default['cluster']['pyxis']['version'] = '0.19.0'
 
 # NVidia
 default['cluster']['nvidia']['enabled'] = 'no'

diff --git a/cookbooks/aws-parallelcluster-platform/recipes/config.rb b/cookbooks/aws-parallelcluster-platform/recipes/config.rb
@@ -26,3 +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
diff --git a/cookbooks/aws-parallelcluster-platform/resources/enroot/enroot_redhat8.rb b/cookbooks/aws-parallelcluster-platform/resources/enroot/enroot_redhat8.rb
@@ -20,5 +20,5 @@
 use 'partial/_enroot_rhel.rb'
 
 def prerequisites
-  %w(jq fuse-overlayfs squashfs-tools parallel pigz squashfuse zstd)
+  %w(jq fuse-overlayfs parallel pigz squashfuse zstd)
 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
@@ -17,7 +17,9 @@
 
 action :setup do
   action_install_package
+end
 
+action :configure do
   bash "Configure enroot" do
     user 'root'
     code <<-ENROOT_CONFIGURE

diff --git a/cookbooks/aws-parallelcluster-slurm/recipes/install/install_pyxis.rb b/cookbooks/aws-parallelcluster-slurm/recipes/install/install_pyxis.rb
@@ -15,14 +15,13 @@
 # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and
 # limitations under the License.
 
-pyxis_version = "0.20.0"
-pyxis_tarball = "#{node['cluster']['sources_dir']}/pyxis-#{pyxis_version}.tar.gz"
+pyxis_version = node['cluster']['pyxis']['version']
 
 bash "Install pyxis" do
   user 'root'
   code <<-PYXIS_INSTALL
     set -e
-    git clone --depth 1 --branch #{pyxis_version} https://github.com/NVIDIA/pyxis.git /tmp/pyxis
+    git clone --depth 1 --branch v#{pyxis_version} https://github.com/NVIDIA/pyxis.git /tmp/pyxis
     cd /tmp/pyxis
     CPPFLAGS='-I /opt/slurm/include/' make
     CPPFLAGS='-I /opt/slurm/include/' make install