Skip to content

Commit ef05e60

Browse files
committed
Hardcode SlurmdSpoolDir to the default /var/spool/slurmd
openhpc_slurmd_spool_dir was not used in slurm.conf
1 parent 65530b9 commit ef05e60

3 files changed

Lines changed: 1 addition & 5 deletions

File tree

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,6 @@ that this is *not the same* as the Ansible `omit` [special variable](https://doc
149149

150150
`openhpc_state_save_location`: Optional. Absolute path for Slurm controller state (`slurm.conf` parameter [StateSaveLocation](https://slurm.schedmd.com/slurm.conf.html#OPT_StateSaveLocation))
151151

152-
`openhpc_slurmd_spool_dir`: Optional. Absolute path for slurmd state (`slurm.conf` parameter [SlurmdSpoolDir](https://slurm.schedmd.com/slurm.conf.html#OPT_SlurmdSpoolDir))
153-
154152
`openhpc_slurm_conf_template`: Optional. Path of Jinja template for `slurm.conf` configuration file. Default is `slurm.conf.j2` template in role. **NB:** The required templating is complex, if just setting specific parameters use `openhpc_config` intead.
155153

156154
`openhpc_slurm_conf_path`: Optional. Path to template `slurm.conf` configuration file to. Default `/etc/slurm/slurm.conf`

defaults/main.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ openhpc_default_config:
1818
SlurmctldHost: "{{ openhpc_slurm_control_host }}{% if openhpc_slurm_control_host_address is defined %}({{ openhpc_slurm_control_host_address }}){% endif %}"
1919
ProctrackType: proctrack/cgroup
2020
TaskPlugin: task/cgroup,task/affinity
21-
SlurmdSpoolDir: /var/spool/slurm # NB: not OpenHPC default!
2221
SlurmUser: slurm
2322
StateSaveLocation: "{{ openhpc_state_save_location }}"
2423
SlurmctldTimeout: 300
@@ -68,7 +67,6 @@ openhpc_mpi_template: mpi.conf.j2
6867
openhpc_mpi_config: {}
6968

7069
openhpc_state_save_location: /var/spool/slurmctld
71-
openhpc_slurmd_spool_dir: /var/spool/slurm
7270
openhpc_slurm_conf_path: /etc/slurm/slurm.conf
7371
openhpc_slurm_conf_template: slurm.conf.j2
7472

tasks/runtime.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
enable: control
2222
- path: "{{ openhpc_slurm_conf_path | dirname }}"
2323
enable: control
24-
- path: "{{ openhpc_slurmd_spool_dir }}" # SlurmdSpoolDir
24+
- path: "/var/spool/slurmd" # SLURM's default for SlurmdSpoolDir
2525
enable: batch
2626
when: "openhpc_enable[item.enable] | default(false) | bool"
2727

0 commit comments

Comments
 (0)