From 077988e03dc4f2e2e1f6079aafb4f3c526f66c54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20M=C3=BCller?= <thorsten.mueller@uni-wuppertal.de>
Date: Mon, 26 Apr 2021 18:00:40 +0200
Subject: [PATCH] privileged container switch

---
 play.yml                                                   | 2 ++
 roles/slurm/defaults/main.yml                              | 1 +
 roles/slurm/tasks/main.yml                                 | 7 ++++---
 .../slurm/{files/cgroup.conf => templates/cgroup.conf.j2}  | 0
 roles/slurm/{files/slurm.conf => templates/slurm.conf.j2}  | 7 ++++++-
 5 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 roles/slurm/defaults/main.yml
 rename roles/slurm/{files/cgroup.conf => templates/cgroup.conf.j2} (100%)
 rename roles/slurm/{files/slurm.conf => templates/slurm.conf.j2} (94%)

diff --git a/play.yml b/play.yml
index a440d65..452eaec 100644
--- a/play.yml
+++ b/play.yml
@@ -37,4 +37,6 @@
   - name: "setup slurm test environment in docker containers"
     import_role:
       name: slurm
+    vars:
+      container_privileged: True
     tags: slurm
diff --git a/roles/slurm/defaults/main.yml b/roles/slurm/defaults/main.yml
new file mode 100644
index 0000000..f5ba310
--- /dev/null
+++ b/roles/slurm/defaults/main.yml
@@ -0,0 +1 @@
+container_privileged: False
diff --git a/roles/slurm/tasks/main.yml b/roles/slurm/tasks/main.yml
index 86fd83e..90c4faf 100644
--- a/roles/slurm/tasks/main.yml
+++ b/roles/slurm/tasks/main.yml
@@ -39,10 +39,10 @@
     path: /container/volumes/slurm/
     state: directory
 
-- name: copy slurm config
-  copy:
+- name: upload slurm config
+  template:
     force: true
-    src: "{{item}}"
+    src: "{{item}}.j2"
     dest: "/container/volumes/slurm/{{item}}"
   loop:
     - slurm.conf
@@ -70,6 +70,7 @@
     state: started
     detach: True
     cleanup: True
+    privileged: "{{ container_privileged | ternary(True,False) }}"
     networks_cli_compatible: True
   vars:
     default_mounts:
diff --git a/roles/slurm/files/cgroup.conf b/roles/slurm/templates/cgroup.conf.j2
similarity index 100%
rename from roles/slurm/files/cgroup.conf
rename to roles/slurm/templates/cgroup.conf.j2
diff --git a/roles/slurm/files/slurm.conf b/roles/slurm/templates/slurm.conf.j2
similarity index 94%
rename from roles/slurm/files/slurm.conf
rename to roles/slurm/templates/slurm.conf.j2
index 8a7bd1b..1441dda 100644
--- a/roles/slurm/files/slurm.conf
+++ b/roles/slurm/templates/slurm.conf.j2
@@ -36,8 +36,13 @@ MpiDefault=pmix
 #PluginDir=
 #PlugStackConfig=
 #PrivateData=jobs
-# ProctrackType=proctrack/cgroup
+{% if container_privileged -%}
+ProctrackType=proctrack/cgroup
+{% else -%}
+{# when not running privileged docker container, cgroups cannot be used and
+   jobs fail without comment in any log #}
 ProctrackType=proctrack/linuxproc
+{% endif %}
 #Prolog=
 #PrologFlags=
 #PrologSlurmctld=