From 43468240a7fd72580b14f606990c95011cd91d6e Mon Sep 17 00:00:00 2001
From: CVL-GitHub <jupiter.hu@monash.edu>
Date: Thu, 16 Apr 2015 12:35:49 +1000
Subject: [PATCH] m2cvl update 15 April 2015
---
roles/slurm-from-source/tasks/main.yml | 12 ++++++++++++
roles/slurm-from-source/templates/slurm.conf.j2 | 8 ++++----
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/roles/slurm-from-source/tasks/main.yml b/roles/slurm-from-source/tasks/main.yml
index 6a7570b9..9021ff0f 100644
--- a/roles/slurm-from-source/tasks/main.yml
+++ b/roles/slurm-from-source/tasks/main.yml
@@ -26,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 }}
diff --git a/roles/slurm-from-source/templates/slurm.conf.j2 b/roles/slurm-from-source/templates/slurm.conf.j2
index ac0ebfe6..096c7d08 100644
--- a/roles/slurm-from-source/templates/slurm.conf.j2
+++ b/roles/slurm-from-source/templates/slurm.conf.j2
@@ -21,12 +21,12 @@ SlurmdPort=6818
AuthType=auth/munge
#JobCredentialPrivateKey=
#JobCredentialPublicCertificate=
-StateSaveLocation={{ slurm_dir }}/var/state
-SlurmdSpoolDir={{ slurm_dir }}/var/spool
+StateSaveLocation={{ slurmstatedir }}
+SlurmdSpoolDir={{ slurmdatadir }}
SwitchType=switch/none
MpiDefault=none
-SlurmctldPidFile={{ slurm_dir }}/var/run/slurmctld.pid
-SlurmdPidFile={{ slurm_dir }}/var/run/slurmd.pid
+SlurmctldPidFile={{ slurmpiddir }}/slurmctld.pid
+SlurmdPidFile={{ slurmpiddir }}/slurmd.pid
ProctrackType=proctrack/pgid
#PluginDir=
CacheGroups=0
--
GitLab