Adding Chef Attributes for enabling Pyxis and enroot

Author: Himani Deshpande

cookbooks/aws-parallelcluster-platform/attributes/platform.rb

@@ -11,7 +11,9 @@
 
 # Enroot + Pyxis
 default['cluster']['enroot']['version'] = '3.4.1'
+default['cluster']['enroot']['enabled'] = 'no'
 default['cluster']['pyxis']['version'] = '0.20.0'
+default['cluster']['pyxis']['enabled'] = 'no'
 
 # NVidia
 default['cluster']['nvidia']['enabled'] = 'no'

cookbooks/aws-parallelcluster-platform/resources/enroot/partial/_enroot_common.rb

@@ -23,6 +23,8 @@
 action :configure do
   return if on_docker?
   return unless enroot_installed
+  return unless configure_enroot
+  return unless configure_pyxis
 
   cookbook_file "/tmp/enroot.template.conf" do
     source 'enroot/enroot.template.conf'
@@ -59,7 +61,6 @@
       set -e
       ENROOT_CONFIG_RELEASE=pyxis
       SHARED_DIR=#{node['cluster']['shared_dir']}
-      
       ENROOT_CACHE_PATH=${SHARED_DIR}/enroot envsubst < /tmp/enroot.template.conf > /tmp/enroot.conf
       mv /tmp/enroot.conf /etc/enroot/enroot.conf
       chmod 0644 /etc/enroot/enroot.conf
@@ -76,11 +77,10 @@
     mode '0644'
   end
 
-
   link '/usr/local/share/pyxis/pyxis.conf' do
     to "#{node['cluster']['slurm']['install_dir']}/etc/plugstack.conf.d/pyxis.conf"
   end
-  
+
   template "#{node['cluster']['slurm']['install_dir']}/etc/plugstack.conf.d/pyxis.conf " do
     source 'pyxis/pyxis.conf.erb'
     cookbook 'aws-parallelcluster-platform'
@@ -89,14 +89,13 @@
     mode '0644'
   end
 
-  
   bash "Configure Pyxis" do
     user 'root'
-    code <<-PYXIS_CONFIGURE 
+    code <<-PYXIS_CONFIGURE
+      set -e
       SHARED_DIR=#{node['cluster']['shared_dir']}
       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_CONFIGURE
     retries 3
     retry_delay 5
@@ -110,3 +109,11 @@ def package_version
 def enroot_installed
   ::File.exist?('/usr/bin/enroot')
 end
+
+def configure_enroot
+  ['yes', true].include?(node['cluster']['enroot']['enabled'])
+end
+
+def configure_pyxis
+  ['yes', true].include?(node['cluster']['pyxis']['enabled'])
+end