From f5281eaffc8138184104151dd3ea8cc3928481f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20M=C3=BCller?= <thoto@devtal.de>
Date: Tue, 27 Apr 2021 14:41:34 +0200
Subject: [PATCH] variable username

---
 inv.yml                              | 1 +
 roles/docker-htcondor/tasks/main.yml | 6 +++---
 roles/docker/tasks/main.yml          | 2 +-
 roles/slurm/tasks/dockerimage.yml    | 4 ++--
 roles/slurm/tasks/main.yml           | 2 +-
 singularity.yml                      | 2 +-
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/inv.yml b/inv.yml
index d21860b..b2dee1f 100644
--- a/inv.yml
+++ b/inv.yml
@@ -5,6 +5,7 @@ all:
       ansible_host: ed-c7-1.virt.magni.thoto.net
       ssh_args: -o ControlMaster=auto -o ControlPersist=60s
       # ansible_host: 192.168.122.139
+      unpriv_user: thoto
   children:
     htcondor:
       hosts:
diff --git a/roles/docker-htcondor/tasks/main.yml b/roles/docker-htcondor/tasks/main.yml
index b223b62..bbdeb72 100644
--- a/roles/docker-htcondor/tasks/main.yml
+++ b/roles/docker-htcondor/tasks/main.yml
@@ -2,14 +2,14 @@
   file:
     path: "/container/docker-images/htcondor"
     state: directory
-    owner: thoto
+    owner: "{{unpriv_user}}"
     group: docker
     mode: "u=rwx,g=rwx,o=rx"
 
 - copy:
     dest: "/container/docker-images/htcondor/Dockerfile"
     src: "htcondor.Dockerfile"
-    owner: thoto
+    owner: "{{unpriv_user}}"
     group: docker
   register: cp_dockerfile
 
@@ -26,7 +26,7 @@
   copy:
     src: "conf/{{item}}/"
     dest: "/container/volumes/{{item}}/"
-    owner: thoto
+    owner: "{{unpriv_user}}"
     group: docker
     mode: "u=rwx,g=rwx"
   with_items: [ "cm", "exec", "sub", "common"]
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index 60c065a..5946f94 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -51,6 +51,6 @@
 
 - name: "fix user privileges to run docker"
   user:
-    name: thoto
+    name: "{{unpriv_user}}"
     groups: docker
     append: True
diff --git a/roles/slurm/tasks/dockerimage.yml b/roles/slurm/tasks/dockerimage.yml
index 6059f1b..cf73759 100644
--- a/roles/slurm/tasks/dockerimage.yml
+++ b/roles/slurm/tasks/dockerimage.yml
@@ -1,13 +1,13 @@
 - file:
     path: "/container/docker-images/{{item}}"
     state: directory
-    owner: thoto
+    owner: "{{unpriv_user}}"
     group: docker
 
 - copy:
     src: "{{item}}.Dockerfile"
     dest: "/container/docker-images/{{item}}/Dockerfile"
-    owner: thoto
+    owner: "{{unpriv_user}}"
     group: docker
   register: slurm_cp_dockerfile
 
diff --git a/roles/slurm/tasks/main.yml b/roles/slurm/tasks/main.yml
index 5732bd1..9ada19d 100644
--- a/roles/slurm/tasks/main.yml
+++ b/roles/slurm/tasks/main.yml
@@ -62,7 +62,7 @@
     - machine: submit1
       image: slurm-slurmd
       extra_mounts:
-      - "/home/thoto/job3/:/mnt/:rw"
+      - "/home/{{unpriv_user}}/job3/:/mnt/:rw"
   tags: [ slurm-config ]
     
 # TODO: reserve some address using docker_network_info and assign as aux
diff --git a/singularity.yml b/singularity.yml
index 57d2ee2..e3f7c94 100644
--- a/singularity.yml
+++ b/singularity.yml
@@ -10,7 +10,7 @@
 
 - name: "enable user thoto for fakeroot access"
   lineinfile:
-    line: "thoto:4294836224:65536"
+    line: "{{unpriv_user}}:4294836224:65536"
     dest: "{{item}}"
   with_items: ["/etc/subuid", "/etc/subgid"]
 # the task above idempotentially does the same as: