From 2a365f1d8bdecc71c2ae80196a8f720fe49b69d2 Mon Sep 17 00:00:00 2001
From: Mika Anttila <mika.anttila@tut.fi>
Date: Wed, 8 May 2019 12:25:10 +0300
Subject: [PATCH] Moving slurm restart script before hw-checks.

---
 templates/nhc.conf.j2 | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/templates/nhc.conf.j2 b/templates/nhc.conf.j2
index 27356e7..c68dadf 100644
--- a/templates/nhc.conf.j2
+++ b/templates/nhc.conf.j2
@@ -42,6 +42,21 @@
 
 {% if nhc_use_default_checks == true %}
 
+{% if nhc_scripts.0 is defined %}
+#######################################################################
+### nhc_scripts is a list of extra nhc scripts which are copied in via ansible
+###
+### More checks
+###
+#
+
+{% for nhc_check in nhc_checks %}
+    {{ nhc_check.match }} || {{ nhc_check.name }} {{ nhc_check.arguments }}
+{% endfor %}
+
+{% endif %}
+
+
 #######################################################################
 ###
 ### Hardware checks
@@ -221,20 +236,6 @@
 # nVidia HealthMon GPU health checks (requires Tesla Development Kit)
 #   * || check_nv_healthmon
 
-{% if nhc_scripts.0 is defined %}
-#######################################################################
-### nhc_scripts is a list of extra nhc scripts which are copied in via ansible
-###
-### More checks
-###
-#
-
-{% for nhc_check in nhc_checks %}
-    {{ nhc_check.match }} || {{ nhc_check.name }} {{ nhc_check.arguments }}
-{% endfor %}
-
-{% endif %}
-
 {% else %}
 {% if nhc_scripts.0 is defined %}
 # Not using any defaults - only the ones defined in nhc_checks