diff --git a/roles/slurm/tasks/main.yml b/roles/slurm/tasks/main.yml index 7f8def4..bc830b9 100644 --- a/roles/slurm/tasks/main.yml +++ b/roles/slurm/tasks/main.yml @@ -67,6 +67,8 @@ - slurm.conf - cgroup.conf vars: + slurm_exec_node_cores: 3 + slurm_exec_node_mem: 5000 # RealMemory=5964 slurm_alloc_nodes_default: - name: "{{slurm_prefix+'-submit1'}}" alloc_nodes: "{{ slurm_alloc_nodes_default + extra_nodes | default([])}}" diff --git a/roles/slurm/templates/slurm.conf.j2 b/roles/slurm/templates/slurm.conf.j2 index 2f9e009..a4cb8ed 100644 --- a/roles/slurm/templates/slurm.conf.j2 +++ b/roles/slurm/templates/slurm.conf.j2 @@ -163,10 +163,15 @@ SlurmSchedLogFile={{slurm_log_path_sched}} # # # COMPUTE NODES -NodeName=slurm-exec[1-{{num_nodes}}] CPUs=2 CoresPerSocket=2 State=UNKNOWN +NodeName=slurm-exec[1-{{ num_nodes }}] CPUs={{ slurm_exec_node_cores }} {{'' + }} RealMemory={{ slurm_exec_node_mem }} {{'' + }} CoresPerSocket={{ slurm_exec_node_cores }} State=UNKNOWN +# RealMemory=5964 {% for i in alloc_nodes -%} NodeName={{i.name}} {%- if i.hostname is defined %} NodeHostname={{i.hostname}} {% endif %} State=UNKNOWN {% endfor %} -PartitionName=debug Nodes=slurm-exec[1-{{num_nodes}}] AllocNodes={{alloc_nodes |map(attribute='name') | join(',')}} Default=YES MaxTime=INFINITE State=UP +PartitionName=debug Nodes=slurm-exec[1-{{num_nodes}}] {{ '' + }} AllocNodes={{alloc_nodes |map(attribute='name') | join(',')}} {{ '' + }} Default=YES MaxTime=INFINITE State=UP