From 9908e8ba84b40bb76f8911f9ee0ab3564249b063 Mon Sep 17 00:00:00 2001
From: CVL-GitHub <jupiter.hu@monash.edu>
Date: Wed, 18 Feb 2015 04:43:40 +0000
Subject: [PATCH] add slurm data directory variable
---
roles/slurm/defaults/main.yml | 2 +-
roles/slurm/tasks/main.yml | 2 +-
roles/slurm/templates/slurm.conf.j2 | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/roles/slurm/defaults/main.yml b/roles/slurm/defaults/main.yml
index 8de2e61..2b482d2 100644
--- a/roles/slurm/defaults/main.yml
+++ b/roles/slurm/defaults/main.yml
@@ -5,4 +5,4 @@ slurmddebug: {}
slurmschedlog: {}
slurmdbdlog: {}
slurmfairshare: {def: false, val: 10000}
-
+slurmdatadir: "/var/spool/slurm"
diff --git a/roles/slurm/tasks/main.yml b/roles/slurm/tasks/main.yml
index a15a008..23d0c68 100644
--- a/roles/slurm/tasks/main.yml
+++ b/roles/slurm/tasks/main.yml
@@ -50,7 +50,7 @@
when: slurm_use_vpn==True
- name: create data directory
- file: path=/var/spool/slurm state=directory owner=slurm group=slurm mode=644
+ file: path="{{ slurmdatadir }}" state=directory owner=slurm group=slurm mode=644
sudo: true
- name: create log directory
diff --git a/roles/slurm/templates/slurm.conf.j2 b/roles/slurm/templates/slurm.conf.j2
index cb73040..d389c91 100644
--- a/roles/slurm/templates/slurm.conf.j2
+++ b/roles/slurm/templates/slurm.conf.j2
@@ -21,8 +21,8 @@ SlurmdPort=6818
AuthType=auth/munge
#JobCredentialPrivateKey=
#JobCredentialPublicCertificate=
-StateSaveLocation=/var/spool/slurmd
-SlurmdSpoolDir=/var/spool/slurmd
+StateSaveLocation={{ slurmdatadir }}
+SlurmdSpoolDir={{ slurmdatadir }}
SwitchType=switch/none
MpiDefault=none
SlurmctldPidFile=/var/run/slurmctld.pid
--
GitLab