Merge branch 'slurmpaths' into 'master'

M3 has decided to change where we store some parts of slurm, in particular prolo…

See merge request !163

roles/slurm-common/tasks/createSlurmDirectories.yml

@@ -7,22 +7,29 @@
   file: dest=/var/lock/subsys state=directory owner=root group=root mode=755
   sudo: true
 
+- name: stat run directory
+  stat: path={{ slurmdatadir }} 
+  become_user: root
+  become: True
+  register: runstat
+  when: slurmdatadir is defined
+
 - name: create data directory
   file: path={{ slurmdatadir }} state=directory owner=slurm group=slurm mode=755
   sudo: true
-  when: slurmdatadir is defined 
+  when: slurmdatadir is defined and not runstat.stat.exists
       
-- name: stat run directory
+- name: stat pid directory
   stat: path={{ slurmpiddir }} 
   become_user: root
   become: True
-  register: runstat
+  register: pidstat
   when: slurmpiddir is defined
 
-- name: create run directory
+- name: create pid directory
   file: path={{ slurmpiddir }} state=directory owner=slurm group=slurm mode=755
   sudo: true
-  when: slurmpiddir is defined and not runstat.stat.exists
+  when: slurmpiddir is defined and not pidstat.stat.exists
 
 - name: create shared state directory
   file: path={{slurmsharedstatedir }} state=directory owner=slurm group=slurm mode=750
@@ -40,10 +47,17 @@
   sudo: true
   when: slurmstatedir is defined  and not usesharedstatedir
 
+- name: stat log directory
+  stat: path={{ slurmlogdir }} 
+  become_user: root
+  become: True
+  register: logstat
+  when: slurmlogdir is defined
+
 - name: create log directory
   file: path={{ slurmlogdir }} state=directory owner=slurm group=slurm mode=750
   sudo: true
-  when: slurmlogdir is defined 
+  when: slurmlogdir is defined and not logstat.stat.exists
 
 - name: make sure slurm conf dir exists
   file: dest={{ slurm_dir }}/etc state=directory

roles/slurm-common/tasks/main.yml

@@ -102,12 +102,17 @@
   template: src="gres.conf.j2" dest={{ slurm_dir }}/etc/gres.conf mode=644
   sudo: true
 
+- name: make slurm prolog dir 
+  file: path=/opt/slurm/etc state=directory mode=755
+  become: true
+  become_user: root
+
 - name: install slurm prolog
-  template: src=slurm.prolog.j2 dest={{ slurm_dir }}/bin/slurm.prolog mode=755
+  template: src=slurm.prolog.j2 dest=/opt/slurm/etc/slurm.prolog mode=755
   sudo: true
 
 - name: install slurm epilog
-  template: src=slurm.epilog.j2 dest={{ slurm_dir }}/bin/slurm.epilog mode=755
+  template: src=slurm.epilog.j2 dest=/opt/slurm/etc/slurm.epilog mode=755
   sudo: true
 
 - name: install slurm.conf