remove openhpc_slurm_configless

Author: sjpb

README.md

@@ -40,8 +40,6 @@ each list element:
 
 `openhpc_slurmdbd_host`: Optional. Where to deploy slurmdbd if are using this role to deploy slurmdbd, otherwise where an existing slurmdbd is running. This should be the name of a host in your inventory. Set this to `none` to prevent the role from managing slurmdbd. Defaults to `openhpc_slurm_control_host`.
 
-`openhpc_slurm_configless`: Optional, default false. If true then slurm's ["configless" mode](https://slurm.schedmd.com/configless_slurm.html) is used.
-
 `openhpc_munge_key_b64`: Optional. A base-64 encoded munge key. If not provided then the one generated on package install is used, but the `openhpc_slurm_control_host` must be in the play.
 
 `openhpc_login_only_nodes`: Optional. If using "configless" mode specify the name of an ansible group containing nodes which are login-only nodes (i.e. not also control nodes), if required. These nodes will run `slurmd` to contact the control node for config.

defaults/main.yml

@@ -43,7 +43,6 @@ openhpc_default_config:
 
 openhpc_config: {}
 openhpc_gres_template: gres.conf.j2
-openhpc_slurm_configless: "{{ 'enable_configless' in openhpc_config.get('SlurmctldParameters', []) }}"
 
 openhpc_state_save_location: /var/spool/slurm
 

tasks/pre.yml

@@ -1,6 +1,6 @@
-- name: Enable batch on configless login-only nodes
+- name: Enable batch on login-only nodes
+  # TODO: why can't we remove this by just setting openhpc_enable.batch: true for appliance login nodes??
   set_fact:
     openhpc_enable: "{{ openhpc_enable | combine({'batch': true}) }}"
   when:
-    - openhpc_slurm_configless
     - openhpc_login_only_nodes in group_names

tasks/runtime.yml

@@ -63,7 +63,7 @@
     owner: root
     group: root
     mode: 0644
-  when: openhpc_enable.control | default(false) or not openhpc_slurm_configless | bool
+  when: openhpc_enable.control | default(false)
   notify:
     - Restart slurmctld service
   register: ohpc_slurm_conf
@@ -76,7 +76,7 @@
     mode: "0600"
     owner: slurm
     group: slurm
-  when: openhpc_enable.control | default(false) or not openhpc_slurm_configless | bool
+  when: openhpc_enable.control | default(false)
   notify:
     - Restart slurmctld service
   register: ohpc_gres_conf
@@ -90,7 +90,7 @@
     mode: "0644" # perms/ownership based off src from ohpc package
     owner: root
     group: root
-  when: openhpc_enable.control | default(false) or not openhpc_slurm_configless | bool
+  when: openhpc_enable.control | default(false)
 
 - name: Remove local tempfile for slurm.conf templating
   ansible.builtin.file:
@@ -132,10 +132,9 @@
 - name: Configure slurmd command line options
   vars:
     slurmd_options_configless: "--conf-server {{ openhpc_slurm_control_host_address | default(openhpc_slurm_control_host) }}"
-    slurmd_options: ""
   lineinfile:
     path: /etc/sysconfig/slurmd
-    line: "SLURMD_OPTIONS='{{ slurmd_options_configless if openhpc_slurm_configless | bool else slurmd_options }}'"
+    line: "SLURMD_OPTIONS='{{ slurmd_options_configless }}'"
     regexp: "^SLURMD_OPTIONS="
     create: yes
     owner: root

templates/slurm.conf.j2

@@ -3,17 +3,10 @@ ClusterName={{ openhpc_cluster_name }}
 # PARAMETERS
 {% for k, v in openhpc_default_config | combine(openhpc_config) | items %}
 {%  if v != "omit" %}{# allow removing items using setting key: null #}
-{%    if k != 'SlurmctldParameters' %}{# handled separately due to openhpc_slurm_configless #}
 {{ k }}={{ v | join(',') if (v is sequence and v is not string) else v }}
-{%    endif %}
 {%  endif %}
 {% endfor %}
 
-{% set slurmctldparameters = ((openhpc_config.get('SlurmctldParameters', []) + (['enable_configless'] if openhpc_slurm_configless | bool else [])) | unique) %}
-{% if slurmctldparameters | length > 0 %}
-SlurmctldParameters={{ slurmctldparameters | join(',') }}
-{% endif %}
-
 # LOGIN-ONLY NODES
 # Define slurmd nodes not in partitions for login-only nodes in "configless" mode:
 {%if openhpc_login_only_nodes %}{% for node in groups[openhpc_login_only_nodes] %}