[SlurmTopo] Adding a slurm_parallelcluster_topology.conf in slurm.conf

Author: Himani Anil Deshpande

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

@@ -160,7 +160,7 @@ def update_nodes_in_queue(strategy, queues)
 end
 
 # Generate Slurm topology.conf file
-execute "generate_topology_config" do
+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']}"\

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

@@ -84,7 +84,8 @@ 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
+
 #
 # 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
+include slurm_parallelcluster_topology.conf

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

@@ -1,9 +1,8 @@
-{# Adding comments at the beginning of each line is a trick to indent the template without affecting the output #}
 # slurm_parallelcluster_topology.conf is managed by the pcluster processes.
 # Do not modify.
 # Please use CustomSlurmSettings in the ParallelCluster configuration file to add user-specific slurm configuration
 # options
 # TOPOLOGY Plugin
 <% unless node['cluster']['p6egb200_block_sizes'].nil? -%>
 TopologyPlugin=topology/block
-<% end -%>
+<% end -%>