[SlurmTopo] Do not support Slurm Topology for AL2

Author: Himani Anil Deshpande

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

@@ -60,6 +60,7 @@
   owner 'root'
   group 'root'
   mode '0644'
+  not_if { platform?('amazon') && node['platform_version'] == "2" }
 end
 
 unless on_docker?

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

@@ -151,22 +151,27 @@ def update_nodes_in_queue(strategy, queues)
   end
 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'
-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
 
-# Generate Slurm topology.conf file
-execute "update_topology_config" 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"\
-            " --block-sizes #{node['cluster']['p6egb200_block_sizes']}"\
-            " --input-file #{node['cluster']['cluster_config_path']}"
-  not_if { ::File.exist?(node['cluster']['previous_cluster_config_path']) && !are_queues_updated? && node['cluster']['p6egb200_block_sizes'].nil? || (platform?('amazon') && node['platform_version'] == "2") }
-  #TODO: Need to remove topology.conf if CB is removed
+    # 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"\
+                " --block-sizes #{node['cluster']['p6egb200_block_sizes']}"\
+                " --input-file #{node['cluster']['cluster_config_path']}"
+      not_if { ::File.exist?(node['cluster']['previous_cluster_config_path']) && !are_queues_updated? && node['cluster']['p6egb200_block_sizes'].nil? }
+      #TODO: Need to remove topology.conf if CB is removed
+    end
+  end
+  not_if { platform?('amazon') && node['platform_version'] == "2" }
 end
 
 execute "generate_pcluster_slurm_configs" do

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

@@ -84,8 +84,9 @@ 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" -%>
 #
 # WARNING!!! The slurm_parallelcluster_topology.conf file included below can be updated by the pcluster process.
 # Please do not edit it.
 include slurm_parallelcluster_topology.conf
+<%  end -%>