Merge branch 'master' of https://github.com/monash-merc/ansible_cluster_in_a_box

roles/slurm-from-source/tasks/installMungeFromSource.yml

-- name: clean up system installation
-  shell: rpm -e munge-libs slurm-munge munge slurm-plugins munge-devel slurm slurm-slurmdbd slurm-perlapi slurm-devel slurm-pam_slurm slurm-sjstat slurm-perlapi slurm-pam_slurm slurm-slurmdb-direct slurm-torque slurm-sjobexit
-  ignore_errors: true
-  sudo: true
-  when: ansible_os_family == 'RedHat'
-
 - name: get munge
   shell: wget https://munge.googlecode.com/files/munge-{{ munge_version }}.tar.bz2
   args:

roles/slurm-from-source/tasks/main.yml

 ---
-- name: clean up system installation
-  shell: rpm -e munge munge-libs munge-devel slurm slurm-sql
-  ignore_errors: true
-  sudo: true
-  when: ansible_os_family == 'RedHat' 
-
 - name: create munge group
   group: name=munge system=yes gid=498
   sudo: true
@@ -32,6 +26,18 @@
 - name: create data directory
   file: path={{ slurmdatadir }} state=directory owner=slurm group=slurm mode=755 
   sudo: true
+  when: slurmdatadir is defined 
+
+- name: create run directory
+  file: path={{ slurmpiddir }} state=directory owner=root group=root mode=755 
+  sudo: true
+  when: slurmpiddir is defined 
+
+- name: create state directory
+  file: path={{ slurmstatedir }} state=directory owner=slurm group=slurm mode=755 
+  sudo: true
+  when: slurmstatedir is defined 
+
 
 - name: create log directory
   shell: mkdir -p {{ slurmddebug.log | dirname }}; chown slurm:slurm {{ slurmddebug.log | dirname }} 

roles/slurm-from-source/templates/slurm.conf.j2

@@ -21,12 +21,12 @@ SlurmdPort=6818
 AuthType=auth/munge
 #JobCredentialPrivateKey=
 #JobCredentialPublicCertificate=
-StateSaveLocation={{ slurmdatadir }}
-SlurmdSpoolDir={{ slurmdatadir }} 
+StateSaveLocation={{ slurmstatedir }}
+SlurmdSpoolDir={{ slurmdatadir }}
 SwitchType=switch/none
 MpiDefault=none
-SlurmctldPidFile=/var/run/slurmctld.pid
-SlurmdPidFile=/var/run/slurmd.pid
+SlurmctldPidFile={{ slurmpiddir }}/slurmctld.pid
+SlurmdPidFile={{ slurmpiddir }}/slurmd.pid
 ProctrackType=proctrack/pgid
 #PluginDir=
 CacheGroups=0
@@ -76,21 +76,21 @@ FastSchedule={{ slurmfastschedule }}
 # LOGGING
 {% if slurmctlddebug %}
 SlurmctldDebug={{ slurmctlddebug.level }}
-SlurmctldLogFile={{ slurmctlddebug.log }}
+SlurmctldLogFile={{ slurm_dir }}{{ slurmctlddebug.log }}
 {% else %}
 #SlurmctldDebug=
 #SlurmctldLogFile=
 {% endif %}
 {% if slurmddebug %}
 SlurmdDebug={{ slurmddebug.level }}
-SlurmdLogFile={{ slurmddebug.log }}
+SlurmdLogFile={{ slurm_dir }}{{ slurmddebug.log }}
 {% else %}
 #SlurmdDebug=
 #SlurmdLogFile=
 {% endif %}
 {% if slurmschedlog %}
 SlurmSchedlogLevel={{ slurmschedlog.level }}
-SlurmSchedLogFile={{ slurmschedlog.log }}
+SlurmSchedLogFile={{ slurm_dir }}{{ slurmschedlog.log }}
 {% else %}
 #SlurmSchedlogLevel=
 #SlurmSchedLogFile=
@@ -98,7 +98,7 @@ SlurmSchedLogFile={{ slurmschedlog.log }}
 JobCompType=jobcomp/none
 #JobCompLoc=
 #
-{% if slurmjob %}
+{% if slurmjob is defined %}
 Prolog={{ slurmjob.prolog }}
 Epilog={{ slurmjob.epilog }}
 {% endif %}

roles/slurmdb/templates/slurmdbd.conf.j2

@@ -22,7 +22,7 @@ DbdHost={{ slurmctrl }}
 SlurmUser=slurm
 #MessageTimeout=300
 #DefaultQOS=normal,standby
-{% if slurmdbdlog %}
+{% if slurmdbdlog is defined %}
 DebugLevel={{ slurmdbdlog.level }}
 LogFile={{ slurmdbdlog.log }}
 {% else %}