From: Julien Cristau <jcristau@debian.org>
Date: Tue, 12 Sep 2017 13:33:11 +0000 (+0200)
Subject: Don't set grub_do_nopat or grub_do_extra unless grub_manage is set
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=736e39525d7e31ad3808478653ac2cdad039c6c8;p=mirror%2Fdsa-puppet.git

Don't set grub_do_nopat or grub_do_extra unless grub_manage is set
---

diff --git a/modules/grub/manifests/init.pp b/modules/grub/manifests/init.pp
index 7d9a1816f..989d44423 100644
--- a/modules/grub/manifests/init.pp
+++ b/modules/grub/manifests/init.pp
@@ -25,11 +25,12 @@ class grub {
 		$grub_manage = false
 	}
 
-	# 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 {
+		# 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]
+
 		file { '/etc/default/grub':
 			# restore to default
 			source => 'puppet:///modules/grub/etc-default-grub',