Rebase code on top of munge resource definition

Author: NSsirena

attributes/default.rb

@@ -103,9 +103,13 @@
 ].join('/')
 
 # URLs to software packages used during install recipes
-# # Slurm software
 default['cluster']['slurm_plugin_dir'] = '/etc/parallelcluster/slurm_plugin'
 default['cluster']['slurm']['fleet_config_path'] = "#{node['cluster']['slurm_plugin_dir']}/fleet-config.json"
+# Slurm
+default['cluster']['slurm']['user'] = 'slurm'
+default['cluster']['slurm']['user_id'] = node['cluster']['reserved_base_uid'] + 1
+default['cluster']['slurm']['group'] = node['cluster']['slurm']['user']
+default['cluster']['slurm']['group_id'] = node['cluster']['slurm']['user_id']
 # Munge
 default['cluster']['munge']['user'] = 'munge'
 default['cluster']['munge']['user_id'] = node['cluster']['reserved_base_uid'] + 2

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

@@ -50,10 +50,3 @@
 # EFA
 default['cluster']['efa']['installer_version'] = '1.21.0'
 default['cluster']['efa']['unsupported_aarch64_oses'] = %w(centos7)
-
-# Users
-default['cluster']['reserved_base_uid'] = 400
-default['cluster']['slurm']['user'] = 'slurm'
-default['cluster']['slurm']['user_id'] = node['cluster']['reserved_base_uid'] + 1
-default['cluster']['slurm']['group'] = node['cluster']['slurm']['user']
-default['cluster']['slurm']['group_id'] = node['cluster']['slurm']['user_id']

cookbooks/aws-parallelcluster-slurm/attributes/slurm_attributes.rb

@@ -1,5 +1,4 @@
 # Slurm attributes shared between install_slurm and configure_slurm_accounting
-default['cluster']['slurm']['version'] = '22-05-8-1'
 default['cluster']['slurm']['commit'] = ''
 default['cluster']['slurm']['sha256'] = '8c8f6a26a5d51e6c63773f2e02653eb724540ee8b360125c8d7732314ce737d6'
 default['cluster']['slurm']['install_dir'] = '/opt/slurm'

cookbooks/aws-parallelcluster-slurm/attributes/versions.rb

@@ -1,2 +1,4 @@
+# Slurm
+default['cluster']['slurm']['version'] = '22-05-8-1'
 # Munge
 default['cluster']['munge']['munge_version'] = '0.5.14'

cookbooks/aws-parallelcluster-slurm/recipes/install_jwt.rb

@@ -25,17 +25,10 @@
   mode '0644'
   retries 3
   retry_delay 5
+  checksum jwt_sha256
   action :create_if_missing
 end
 
-ruby_block "Validate libjwt Tarball Checksum" do
-  block do
-    require 'digest'
-    checksum = Digest::SHA256.file(jwt_tarball).hexdigest
-    raise "Downloaded Tarball Checksum #{checksum} does not match expected checksum #{jwt_sha256}" if checksum != jwt_sha256
-  end
-end
-
 jwt_dependencies 'Install jwt dependencies'
 
 bash 'libjwt' do

cookbooks/aws-parallelcluster-slurm/recipes/install_pmix.rb

@@ -26,17 +26,10 @@
   mode '0644'
   retries 3
   retry_delay 5
+  checksum pmix_sha256
   action :create_if_missing
 end
 
-ruby_block "Validate PMIx Tarball Checksum" do
-  block do
-    require 'digest'
-    checksum = Digest::SHA256.file(pmix_tarball).hexdigest
-    raise "Downloaded Tarball Checksum #{checksum} does not match expected checksum #{pmix_sha256}" if checksum != pmix_sha256
-  end
-end
-
 bash 'Install PMIx' do
   user 'root'
   group 'root'

cookbooks/aws-parallelcluster-slurm/recipes/install_slurm.rb

@@ -23,16 +23,16 @@
 slurm_group_id = node['cluster']['slurm']['group_id']
 slurm_install_dir = node['cluster']['slurm']['install_dir']
 
-slurm_version = '22-05-8-1'
-slurm_commit = ''
+slurm_version = node['cluster']['slurm']['version']
+slurm_commit = node['cluster']['slurm']['commit']
 slurm_tar_name = if slurm_commit.empty?
                    "slurm-#{slurm_version}"
                  else
                    "#{slurm_commit}"
                  end
 slurm_tarball = "#{node['cluster']['sources_dir']}/#{slurm_tar_name}.tar.gz"
 slurm_url = "https://github.com/SchedMD/slurm/archive/#{slurm_tar_name}.tar.gz"
-slurm_sha256 = '8c8f6a26a5d51e6c63773f2e02653eb724540ee8b360125c8d7732314ce737d6'
+slurm_sha256 = node['cluster']['slurm']['sha256']
 
 # Setup slurm group
 group slurm_group do
@@ -59,17 +59,9 @@
   mode '0644'
   retries 3
   retry_delay 5
+  checksum slurm_sha256
   action :create_if_missing
-end unless redhat_ubi?
-
-# Validate the authenticity of the downloaded archive based on the checksum published by SchedMD
-ruby_block "Validate Slurm Tarball Checksum" do
-  block do
-    require 'digest'
-    checksum = Digest::SHA256.file(slurm_tarball).hexdigest
-    raise "Downloaded Tarball Checksum #{checksum} does not match expected checksum #{slurm_sha256}" if checksum != slurm_sha256
-  end
-end unless redhat_ubi?
+end
 
 # Copy Slurm patches
 remote_directory "#{node['cluster']['sources_dir']}/slurm_patches" do
@@ -81,6 +73,7 @@
 
 # Install Slurm
 bash 'make install' do
+  not_if { redhat_ubi? }
   user 'root'
   group 'root'
   cwd Chef::Config[:file_cache_path]
@@ -115,12 +108,13 @@
   SLURM
   # TODO: Fix, so it works for upgrade
   creates "#{slurm_install_dir}/bin/srun"
-end unless redhat_ubi?
+end
 
 # Copy required licensing files
 directory "#{node['cluster']['license_dir']}/slurm"
 
 bash 'copy license stuff' do
+  not_if { redhat_ubi? }
   user 'root'
   group 'root'
   cwd Chef::Config[:file_cache_path]
@@ -134,9 +128,10 @@
   SLURMLICENSE
   # TODO: Fix, so it works for upgrade
   creates "#{node['cluster']['license_dir']}/slurm/README.rst"
-end unless redhat_ubi?
+end
 
 file '/etc/ld.so.conf.d/slurm.conf' do
+  not_if { redhat_ubi? }
   content "#{slurm_install_dir}/lib/"
   mode '0744'
-end unless redhat_ubi?
+end

cookbooks/aws-parallelcluster-slurm/resources/munge/partial/_munge_actions.rb

@@ -78,6 +78,7 @@
   # Updated munge init script for Amazon Linux
   template '/etc/init.d/munge' do
     source 'munge/munge-init.erb'
+    cookbook 'aws-parallelcluster-slurm'
     owner 'root'
     group 'root'
     variables(munge_user: munge_user,

test/recipes/controls/aws_parallelcluster_slurm/install_slurm_spec.rb

@@ -17,17 +17,19 @@
 control 'slurm_installed' do
   title 'Checks slurm has been installed'
 
+  only_if { !os_properties.redhat_ubi? }
+
   describe file("/opt/slurm") do
     it { should exist }
     it { should be_directory }
     its('mode') { should cmp '0755' }
     its('owner') { should eq 'root' }
     its('group') { should eq 'root' }
   end
-end unless os_properties.redhat_ubi?
+end
 
 control 'slurm_user_and_group_created' do
-  title 'Check slrum user and group exist and are properly configured'
+  title 'Check slurm user and group exist and are properly configured'
 
   describe group(slurm_group) do
     it { should exist }
@@ -37,11 +39,13 @@
     it { should exist }
     its('group') { should eq slurm_group }
   end
-end unless os_properties.redhat_ubi?
+end
 
 control 'slurm_licence_configured' do
   title 'Checks slurm licences folder has the required files'
 
+  only_if { !os_properties.redhat_ubi? }
+
   describe file(slurm_license_path) do
     it { should exist }
     it { should be_directory }
@@ -77,10 +81,12 @@
     its('owner') { should eq 'root' }
     its('group') { should eq 'root' }
   end
-end unless os_properties.redhat_ubi?
+end
 
-control 'slurm_plugin_libraries_compiled' do
-  title 'Checks that all required slurm plugin libraries were compiled'
+control 'slurm_shared_libraries_compiled' do
+  title 'Checks that all required slurm shared libraries were compiled'
+
+  only_if { !os_properties.redhat_ubi? }
 
   describe file("#{slurm_library_folder}/accounting_storage_mysql.so") do
     it { should exist }
@@ -109,11 +115,13 @@
     its('owner') { should eq 'root' }
     its('group') { should eq 'root' }
   end
-end unless os_properties.redhat_ubi?
+end
 
 control 'slurm_library_shared' do
   title 'Checks slurm shared library is part of the runtime search path'
 
+  only_if { !os_properties.redhat_ubi? }
+
   describe file("/etc/ld.so.conf.d/slurm.conf") do
     it { should exist }
     its('mode') { should cmp '0744' }
@@ -123,4 +131,4 @@
       should match('/opt/slurm/lib/')
     end
   end
-end unless os_properties.redhat_ubi?
+end