From 8ce4b911cc5c423833801aab5698bb74a350967d Mon Sep 17 00:00:00 2001
From: CVL-GitHub <jupiter.hu@monash.edu>
Date: Mon, 9 Mar 2015 12:24:48 +1100
Subject: [PATCH] Add slurm default variables
---
roles/cvlExtraFiles/vars/readme.txt | 1 -
roles/slurm/defaults/main.yml | 14 +++++++++-----
roles/slurm/vars/readme.txt | 12 ------------
3 files changed, 9 insertions(+), 18 deletions(-)
delete mode 100644 roles/slurm/vars/readme.txt
diff --git a/roles/cvlExtraFiles/vars/readme.txt b/roles/cvlExtraFiles/vars/readme.txt
index 088e9f2c..6aae5abb 100644
--- a/roles/cvlExtraFiles/vars/readme.txt
+++ b/roles/cvlExtraFiles/vars/readme.txt
@@ -1,6 +1,5 @@
---
extraFiles:
- - {src: '/usr/local/lib/ld-linux.so.2', dest: '/lib/ld-linux.so.2', type: 'link'}
- {src: '/usr/local/etc/sshfs_default_sites.cfg', dest: '/etc/sshfs_default_sites.cfg', type: 'link'}
- {src: '/usr/local/etc/vnc/turbovncserver-auth.conf', dest: '/etc/turbovncserver-auth.conf', type: 'link'}
- {src: '/usr/local/etc/vnc/turbovncserver.conf', dest: '/etc/turbovncserver.conf', type: 'link'}
diff --git a/roles/slurm/defaults/main.yml b/roles/slurm/defaults/main.yml
index 2b482d25..362d9cf4 100644
--- a/roles/slurm/defaults/main.yml
+++ b/roles/slurm/defaults/main.yml
@@ -1,8 +1,12 @@
---
-clustername: "CIAB"
-slurmctlddebug: {}
-slurmddebug: {}
-slurmschedlog: {}
-slurmdbdlog: {}
+slurm_use_vpn: False
+slurmctlddebug: {level: 9, log: '/var/log/slurm/slurmctld.log'}
+slurmddebug: {level: 9, log: '/var/log/slurm/slurmd.log'}
+slurmschedlog: {level: 9, log: '/var/log/slurm/slurmsched.log'}
+slurmdbdlog: {level: 9, log: '/var/log/slurm/slurmdbd.log'}
slurmfairshare: {def: false, val: 10000}
slurmdatadir: "/var/spool/slurm"
+slurmselecttype: "select/linear"
+slurmfastschedule: "1"
+slurmschedulertype: "sched/backfill"
+
diff --git a/roles/slurm/vars/readme.txt b/roles/slurm/vars/readme.txt
deleted file mode 100644
index 85a4b3b5..00000000
--- a/roles/slurm/vars/readme.txt
+++ /dev/null
@@ -1,12 +0,0 @@
----
-slurm_use_vpn: True
-slurmctlddebug: {level: 9, log: '/var/log/slurm/slurmctld.log'}
-slurmddebug: {level: 9, log: '/var/log/slurm/slurmd.log'}
-slurmschedlog: {level: 9, log: '/var/log/slurm/slurmsched.log'}
-slurmdbdlog: {level: 9, log: '/var/log/slurm/slurmdbd.log'}
-slurmfairshare: {def: false, val: 10000}
-slurmdatadir: "/var/spool/slurm"
-slurmselecttype: "select/linear"
-slurmfastschedule: "1"
-slurmschedulertype: "sched/backfill"
-
--
GitLab