Skip to content

Commit fb11f82

Browse files
slight renames and improved structure
1 parent c70e906 commit fb11f82

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

bibigrid/resources/defaults/slurm/slurm.j2

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ JobAcctGatherType=jobacct_gather/linux
1919
# RESOURCES
2020
GresTypes=gpu
2121

22-
SlurmctldParameters=cloud_dns,enable_configless,reconfig_on_restart
22+
SlurmctldParameters=cloud_dns,idle_on_node_suspend,enable_configless,reconfig_on_restart
2323
# didn't work as expected. slurmctld tries to resolve all clients on startup which doesn't work obviously
2424

2525
# PRIORITY
@@ -112,8 +112,6 @@ SuspendExcNodes={{ exclude_groups | join(',') }}
112112
TreeWidth= {{ slurm_conf.elastic_scheduling.TreeWidth }}
113113
# Do not cache dns names
114114
# CommunicationParameters=NoAddrCache # REMOVED for 23.11.0
115-
# Mark node status idle on suspend so DOWN is removed
116-
SlurmctldParameters=idle_on_node_suspend
117115
# Show slurm nodes all the time
118116
PrivateData=cloud
119117
# return node to idle when startup fails

bibigrid/resources/playbook/roles/bibigrid/tasks/041-slurm-server.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
- name: Copy system overrides (slurmd)
1+
- name: Copy system master overrides (slurmd)
22
copy:
33
src: "slurm/systemd/slurmd_master.override"
44
dest: "/etc/systemd/system/slurmd.service.d/override.conf"

bibigrid/resources/playbook/roles/bibigrid/tasks/042-slurm-worker.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
- name: Copy system overrides (slurmd)
1+
- name: Copy system worker overrides (slurmd)
22
template:
33
src: "slurm/systemd/slurmd.override.j2"
44
dest: "/etc/systemd/system/slurmd.service.d/override.conf"
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
# Override systemd service to set conditional path
22
[Service]
3-
ExecStart=/usr/sbin/slurmd --conf-server={{ hostvars[groups.master.0].name }} -D
3+
ExecStart=
4+
ExecStart=/usr/sbin/slurmd --conf-server={{ hostvars[groups.master.0].name }}

0 commit comments

Comments
 (0)