Merge branch 'spankfix42' into 'master'

Spankfix42

See merge request !582

CICD/vars/versions.yml

@@ -27,7 +27,6 @@ munge_src_checksum: "sha1:70f6062b696c6d4f17b1d3bdc47c3f5eca24757c"
 munge_dir: /opt/munge-0.5.14
 munge_src_dir: /opt/src/munge-munge-0.5.14
 
-
 nvidia_mig_parted_version: 0.1.3
 nvidia_mig_parted_src_url: https://github.com/NVIDIA/mig-parted/archive/refs/tags/v0.1.3.tar.gz
 nvidia_mig_parted_src_checksum: "sha1:50597b4a94348c3d52b3234bb22783fa236f1d53"

roles/slurm-common/tasks/installCgroup.yml

@@ -12,11 +12,3 @@
     - cgroup-tools
   when: ansible_os_family == "Debian"
   become: True
-
-    #- name: config cgroup.conf file
-    #  template: dest={{ slurm_dir }}/etc/cgroup.conf src=cgroup.conf.j2 mode=644
-    #  become: True
-
-    #- name: config cgroup_allowed_devices.conf file
-    #  template: dest={{ slurm_dir }}/etc/cgroup_allowed_devices.conf src=cgroup_allowed_devices.conf.j2 mode=644
-    #  become: True

roles/slurm-common/tasks/main.yml

@@ -33,7 +33,7 @@
       mode: u=rwx,g=rx,o=rx
       state: link
     become: true
-  when: hostvars[inventory_hostname]['ansible_devices']['nvme0n1'] is defined
+  when: spankprivatetmpdir is defined and hostvars[inventory_hostname]['ansible_devices']['nvme0n1'] is defined
 
 - name: Link /raid as spankprivatetmpdir if present
   file:
@@ -44,7 +44,7 @@
     mode: u=rwx,g=rx,o=rx
     state: link
   become: true
-  when: raiddir.stat.isdir is defined and raiddir.stat.isdir == True
+  when: spankprivatetmpdir is defined and raiddir.stat.isdir is defined and raiddir.stat.isdir == True
 
 - name: create spankprivatetmpdir as directory  if there is not a fast drive present
   file:
@@ -54,7 +54,7 @@
     mode: u=rwx,g=rx,o=rx
     state: directory
   become: true
-  when: hostvars[inventory_hostname]['ansible_devices']['nvme0n1'] is not defined and raiddir.stat.isdir is not defined
+  when: spankprivatetmpdir is defined and hostvars[inventory_hostname]['ansible_devices']['nvme0n1'] is not defined and raiddir.stat.isdir is not defined
 
 - name: create munge group
   group: name=munge system=yes gid=498

roles/slurm-common/templates/cgroup.conf.j2

@@ -3,5 +3,4 @@ ConstrainDevices=yes
 ConstrainCores=yes
 ConstrainRAMSpace=yes
 ConstrainKmemSpace=no
-AllowedDevicesFile={{ slurm_dir }}/etc/cgroup_allowed_devices.conf
 

roles/slurm-common/templates/cgroup_allowed_devices.conf.j2

-/dev/vd*
-/dev/null
-/dev/zero
-/dev/urandom
-/dev/cpu/*/*
-