From: Julien Cristau <jcristau@debian.org>
Date: Sun, 3 Sep 2017 16:07:13 +0000 (+0200)
Subject: grub: don't hardcode the list of hosts with nopat
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=177542496d0839ae969ca2d91f1078fcccd62e1f;p=mirror%2Fdsa-puppet.git

grub: don't hardcode the list of hosts with nopat
---

diff --git a/modules/grub/manifests/init.pp b/modules/grub/manifests/init.pp
index 3eeb828ef..7d9a1816f 100644
--- a/modules/grub/manifests/init.pp
+++ b/modules/grub/manifests/init.pp
@@ -25,7 +25,8 @@ class grub {
 		$grub_manage = false
 	}
 
-	$grub_do_nopat = $::hostname in [ubc-enc2bl01,ubc-enc2bl02,ubc-enc2bl09,ubc-enc2bl10,casulana,mirror-anu,sallinen,storace,mirror-accumu,bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,bm-bl9,bm-bl10,bm-bl11,bm-bl12,bm-bl13,bm-bl14,villa]
+	# hp-health requires nopat on linux 4.9
+	$grub_do_nopat = ($::systemproductname =~ /^ProLiant/ and versioncmp($::kernelversion, '4.9') >= 0)
 	$grub_do_extra = $::hostname in [fasolo]
 
 	if $grub_manage {