From 9b1d00004a31ab5ab431297a9408118d7b82edca Mon Sep 17 00:00:00 2001 From: bertiethorpe <84867280+bertiethorpe@users.noreply.github.com> Date: Tue, 22 Apr 2025 15:25:30 +0100 Subject: [PATCH 1/2] Fix slurm.conf jinja templating trim_blocks on by default in Ansible so extra newline required at end of template tag --- templates/slurm.conf.j2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/slurm.conf.j2 b/templates/slurm.conf.j2 index 67cc180..a4e963c 100644 --- a/templates/slurm.conf.j2 +++ b/templates/slurm.conf.j2 @@ -10,6 +10,7 @@ # ClusterName={{ openhpc_cluster_name }} SlurmctldHost={{ openhpc_slurm_control_host }}{% if openhpc_slurm_control_host_address is defined %}({{ openhpc_slurm_control_host_address }}){% endif %} + #SlurmctldHost= # #DisableRootJobs=NO @@ -186,4 +187,5 @@ PartitionName={{part.name}} Default={{ part.get('default', 'YES') }} MaxTime={{ NodeName=nonesuch {% if openhpc_slurm_configless %}SlurmctldParameters=enable_configless{% endif %} + ReturnToService=2 From 87f841a2a6d94703ed990aaa37d7a2bca95b4fe4 Mon Sep 17 00:00:00 2001 From: bertiethorpe <84867280+bertiethorpe@users.noreply.github.com> Date: Tue, 22 Apr 2025 16:36:48 +0100 Subject: [PATCH 2/2] Update slurm.conf.j2 --- templates/slurm.conf.j2 | 2 -- 1 file changed, 2 deletions(-) diff --git a/templates/slurm.conf.j2 b/templates/slurm.conf.j2 index a4e963c..15da07d 100644 --- a/templates/slurm.conf.j2 +++ b/templates/slurm.conf.j2 @@ -11,8 +11,6 @@ ClusterName={{ openhpc_cluster_name }} SlurmctldHost={{ openhpc_slurm_control_host }}{% if openhpc_slurm_control_host_address is defined %}({{ openhpc_slurm_control_host_address }}){% endif %} -#SlurmctldHost= -# #DisableRootJobs=NO #EnforcePartLimits=NO #EpilogSlurmctld=