Merge pull request #59 from CVL-GitHub/cvl2branch

fixed data directory

roles/slurm/defaults/main.yml

@@ -5,4 +5,4 @@ slurmddebug: {}
 slurmschedlog: {} 
 slurmdbdlog: {}
 slurmfairshare: {def: false, val: 10000}
-
+slurmdatadir: "/var/spool/slurm"

roles/slurm/tasks/main.yml

@@ -50,13 +50,11 @@
   when: slurm_use_vpn==True
 
 - name: create data directory
-  shell: mkdir -p /var/spool/slurm 
-  args:
-    creates: "/var/spool/slurm"
+  file: path="{{ slurmdatadir }}" state=directory owner=slurm group=slurm mode=644 
   sudo: true
 
 - name: create log directory
-  shell: mkdir -p {{ slurmddebug.log | dirname }} 
+  shell: mkdir -p {{ slurmddebug.log | dirname }}; chown slurm:slurm {{ slurmddebug.log | dirname }} 
   args:
     creates: "{{ slurmddebug.log | dirname }}"
   sudo: true

roles/slurm/templates/slurm.conf.j2

@@ -15,14 +15,14 @@ ControlMachine={{ slurmctrl }}
 #BackupAddr=
 #
 SlurmUser=slurm
-#SlurmdUser=root
+SlurmdUser=root
 SlurmctldPort=6817
 SlurmdPort=6818
 AuthType=auth/munge
 #JobCredentialPrivateKey=
 #JobCredentialPublicCertificate=
-StateSaveLocation=/var/spool
-SlurmdSpoolDir=/var/spool/slurmd
+StateSaveLocation={{ slurmdatadir }}
+SlurmdSpoolDir={{ slurmdatadir }} 
 SwitchType=switch/none
 MpiDefault=none
 SlurmctldPidFile=/var/run/slurmctld.pid