Fix Enroot paths

Author: arnaudfroidmont

playbooks/roles/nvidia-enroot/tasks/oraclelinux-7.yml

@@ -42,15 +42,15 @@
       dest: /etc/enroot/enroot.conf
       state: present
       regexp: '^#ENROOT_RUNTIME_PATH.*'
-      line: 'ENROOT_RUNTIME_PATH        {{enroot_top_path}}/enroot/user-$(id -u)'
+      line: 'ENROOT_RUNTIME_PATH        {{enroot_top_path}}/enroot_runtime/user-$(id -u)'
       backup: yes
 
   - name: update ENROOT_DATA_PATH
     lineinfile: 
       dest: /etc/enroot/enroot.conf
       state: present
       regexp: '^#ENROOT_DATA_PATH.*'
-      line: 'ENROOT_DATA_PATH        {{enroot_top_path}}/enroot-data/user-$(id -u)'
+      line: 'ENROOT_DATA_PATH        {{enroot_top_path}}/enroot_data/user-$(id -u)'
       backup: yes
 
   - name: update ENROOT_CACHE_PATH
@@ -69,6 +69,7 @@
       line: 'ENROOT_TEMP_PATH        {{enroot_top_path}}/enroot_tmp'
       backup: yes
 
+
   - name: set permissions on {{enroot_top_path}}
     become: true
     file:
@@ -79,12 +80,18 @@
       group: "{{privilege_group_name}}"
       recurse: no
 
-  - name: Make sure {{enroot_top_path}}/enroot-data directory exist
+
+  - name: Make sure all {{enroot_top_path}} directories exist
     file:
-      path: "{{enroot_top_path}}/enroot-data"
+      path: "{{enroot_top_path}}/{{item}}"
       state: directory
       mode: '0775'
       owner: opc
       group: "{{privilege_group_name}}"
       recurse: no
+    with_items: 
+      - enroot_data
+      - enroot_tmp
+      - enroot_cache
+      - enroot_runtime
 

playbooks/roles/slurm/templates/prolog.sh.j2

@@ -1,11 +1,5 @@
 #!/bin/sh
-runtime_path="$(sudo -u "$SLURM_JOB_USER" sh -c 'echo "/tmp/enroot/user-$(id -u)"')"
-mkdir -p "$runtime_path"
-chown "$SLURM_JOB_USER:$(id -g "$SLURM_JOB_USER")" "$runtime_path"
-chmod 0700 "$runtime_path"
-
-#!/bin/sh
-runtime_path="$(sudo -u "$SLURM_JOB_USER" sh -c 'echo "{{enroot_top_path}}/enroot/user-$(id -u)"')"
+runtime_path="$(sudo -u "$SLURM_JOB_USER" sh -c 'echo "{{enroot_top_path}}/enroot_runtime/user-$(id -u)"')"
 mkdir -p "$runtime_path"
 chown "$SLURM_JOB_USER:$(id -g "$SLURM_JOB_USER")" "$runtime_path"
 #chmod 777 -R /tmp