Merge remote-tracking branch 'origin/slurmtestfix' into mockldap

CICD/plays/computenodes.yml

@@ -60,20 +60,6 @@
   roles:
   - { role: slurm_config, tags: [slurm, slurm_config] }
 
-- hosts: 'DesktopNodes,ComputeNodes'
-  gather_facts: False
-  vars_files:
-  - vars/passwords.yml
-  - vars/names.yml
-  - vars/ldapConfig.yml
-  - vars/filesystems.yml
-  - vars/slurm.yml
-  - vars/vars.yml
-  strategy: free
-  roles:
-  - { role: slurm-start, start_slurmd: True, tags: [ slurm, slurmstart ] }
-  #- { role: mate-de-install, tags: [ mate-de-install ] }   # TODO this crashes for everything except cmca
-
 - hosts: 'K1Nodes'
   tasks:
   - { name: set nvidia driver version, set_fact: nvidia_version='367.130' }
@@ -84,7 +70,7 @@
   - { name: set cuda monitoring, set_fact: cudamonitor=true }
   tags: [ always ]
 
-- hosts: 'ComputeNodes'
+- hosts: 'ComputeNodes,DesktopNodes'
   vars_files:
   - vars/slurm.yml
   roles: