From 8cac4b88477d1acc6061728b02b22c759cfb7548 Mon Sep 17 00:00:00 2001
From: Chris Hines <chris.hines@monash.edu>
Date: Thu, 16 Apr 2015 03:56:18 +0000
Subject: [PATCH] jinja template wasn't working well with undefined variables
---
roles/slurm-from-source/templates/slurm.conf.j2 | 2 +-
roles/slurmdb/templates/slurmdbd.conf.j2 | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/roles/slurm-from-source/templates/slurm.conf.j2 b/roles/slurm-from-source/templates/slurm.conf.j2
index b8d0753a..1a4f0a3d 100644
--- a/roles/slurm-from-source/templates/slurm.conf.j2
+++ b/roles/slurm-from-source/templates/slurm.conf.j2
@@ -98,7 +98,7 @@ SlurmSchedLogFile={{ slurmschedlog.log }}
JobCompType=jobcomp/none
#JobCompLoc=
#
-{% if slurmjob %}
+{% if slurmjob is defined %}
Prolog={{ slurmjob.prolog }}
Epilog={{ slurmjob.epilog }}
{% endif %}
diff --git a/roles/slurmdb/templates/slurmdbd.conf.j2 b/roles/slurmdb/templates/slurmdbd.conf.j2
index fb5e8197..5a6cd9ae 100644
--- a/roles/slurmdb/templates/slurmdbd.conf.j2
+++ b/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 %}
--
GitLab