[SlurmTopo] Do not support Slurm Topology for AL2

Author: Himani Anil Deshpande

cookbooks/aws-parallelcluster-slurm/libraries/helpers.rb

@@ -242,3 +242,7 @@ def check_for_protected_mode(fleet_status_command) # rubocop:disable Lint/Nested
 def get_login_node_pool_config(config, pool_name)
   config['LoginNodes']['Pools'].select { |pool| pool['Name'] == pool_name }.first
 end
+
+def is_amazon_linux_2?
+  platform?('amazon') && node['platform_version'] == "2"
+end

cookbooks/aws-parallelcluster-slurm/recipes/config/config_head_node.rb

@@ -45,6 +45,7 @@
   owner 'root'
   group 'root'
   mode '0644'
+  variables( is_amazon_linux_2: is_amazon_linux_2? )
 end
 
 template "#{node['cluster']['slurm']['install_dir']}/etc/gres.conf" do
@@ -60,7 +61,7 @@
   owner 'root'
   group 'root'
   mode '0644'
-  not_if { platform?('amazon') && node['platform_version'] == "2" }
+  not_if { is_amazon_linux_2? }
 end
 
 unless on_docker?

cookbooks/aws-parallelcluster-slurm/recipes/update/update_head_node.rb

@@ -151,35 +151,34 @@ def update_nodes_in_queue(strategy, queues)
   end
 end
 
-ruby_block "Update slurm topology" do
-  block do
-    # Update slurm_parallelcluster_topology to add/remove Block Topology plugin
-    template "#{node['cluster']['slurm']['install_dir']}/etc/slurm_parallelcluster_topology.conf" do
-      source 'slurm/slurm_parallelcluster_topology.conf.erb'
-      owner 'root'
-      group 'root'
-      mode '0644'
-    end
+# Update slurm_parallelcluster_topology to add/remove Block Topology plugin
+template "#{node['cluster']['slurm']['install_dir']}/etc/slurm_parallelcluster_topology.conf" do
+  source 'slurm/slurm_parallelcluster_topology.conf.erb'
+  owner 'root'
+  group 'root'
+  mode '0644'
+  not_if { is_amazon_linux_2? }
+end
 
-    if node['cluster']['p6egb200_block_sizes'].nil? && are_queues_updated? && ::File.exist?("#{node['cluster']['slurm']['install_dir']}/etc/topology.conf")
-      # If topology.conf exist and Capacity Block is removed, we cleanup
-      topology_generator_command_args = " --cleanup"
-    elsif node['cluster']['p6egb200_block_sizes'].nil? && !are_queues_updated?
-      # We do nothing if p6e-gb200 is not used and queues are not updated
-      topology_generator_command_args = nil
-    else
-      topology_generator_command_args = " --block-sizes #{node['cluster']['p6egb200_block_sizes']}"
-    end
-    # Update Slurm topology.conf file
-    execute "update or cleanup topology.conf" do
-      command "#{cookbook_virtualenv_path}/bin/python #{node['cluster']['scripts_dir']}/slurm/pcluster_topology_generator.py"\
-                " --output-file #{node['cluster']['slurm']['install_dir']}/etc/topology.conf"\
-                " --input-file #{node['cluster']['cluster_config_path']}"\
-                "#{topology_generator_command_args}"
-      not_if { ::File.exist?(node['cluster']['previous_cluster_config_path']) && topology_generator_command_args.nil? }
-    end
+def topology_generator_command_args
+  if node['cluster']['p6egb200_block_sizes'].nil? && are_queues_updated? && ::File.exist?("#{node['cluster']['slurm']['install_dir']}/etc/topology.conf")
+    # If topology.conf exist and Capacity Block is removed, we cleanup
+    " --cleanup"
+  elsif node['cluster']['p6egb200_block_sizes'].nil? && !are_queues_updated?
+    # We do nothing if p6e-gb200 is not used and queues are not updated
+    nil
+  else
+    " --block-sizes #{node['cluster']['p6egb200_block_sizes']}"
   end
-  not_if { platform?('amazon') && node['platform_version'] == "2" }
+end
+
+# Update Slurm topology.conf file
+execute "update or cleanup topology.conf" do
+  command "#{cookbook_virtualenv_path}/bin/python #{node['cluster']['scripts_dir']}/slurm/pcluster_topology_generator.py"\
+            " --output-file #{node['cluster']['slurm']['install_dir']}/etc/topology.conf"\
+            " --input-file #{node['cluster']['cluster_config_path']}"\
+            "#{topology_generator_command_args}"
+  not_if { ::File.exist?(node['cluster']['previous_cluster_config_path']) && topology_generator_command_args.nil? || is_amazon_linux_2? }
 end
 
 execute "generate_pcluster_slurm_configs" do

cookbooks/aws-parallelcluster-slurm/templates/default/slurm/slurm.conf.erb

@@ -84,7 +84,7 @@ include slurm_parallelcluster.conf
 # WARNING!!! The custom_slurm_settings_include_file_slurm.conf file included below can be updated by the pcluster process.
 # Please do not edit it.
 include pcluster/custom_slurm_settings_include_file_slurm.conf
-<% unless platform?('amazon') && node['platform_version'] == "2" -%>
+<% unless @is_amazon_linux_2 -%>
 #
 # WARNING!!! The slurm_parallelcluster_topology.conf file included below can be updated by the pcluster process.
 # Please do not edit it.