From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 19 Aug 2017 14:35:55 +0000 (+0200)
Subject: Simplify setting grub_do_nopat
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=13a25f50b3c02c19412a0b735c655ca203645105;p=mirror%2Fdsa-puppet.git

Simplify setting grub_do_nopat
---

diff --git a/modules/grub/manifests/init.pp b/modules/grub/manifests/init.pp
index c4db78f48..1f0079f8f 100644
--- a/modules/grub/manifests/init.pp
+++ b/modules/grub/manifests/init.pp
@@ -8,26 +8,20 @@ class grub {
 		$grub_manage = true
 		$grub_do_kernel_serial = true
 		$grub_do_grub_serial = true
-		$grub_do_nopat = true
 	} elsif $::hostname in [mirror-skroutz,aagaard,acker,arm-arm-01,fasolo] {
 		$grub_manage = true
 		$grub_do_kernel_serial = true
 		$grub_do_grub_serial = true
-		$grub_do_nopat = false
 	} elsif $::hostname in [acker,arm-arm-03] {
 		$grub_manage = true
 		$grub_do_kernel_serial = true
 		$grub_do_grub_serial = false
-		$grub_do_nopat = false
 	} else {
 		$grub_manage = false
 	}
 
-	if $::hostname in [fasolo] {
-		$grub_do_extra = true
-	} else {
-		$grub_do_extra = false
-	}
+	$grub_do_nopat = $::hostname in [ubc-enc2bl01,ubc-enc2bl02,ubc-enc2bl09,ubc-enc2bl10,casulana,mirror-anu,sallinen,storace,mirror-accumu]
+	$grub_do_extra = $::hostname in [fasolo]
 
 	if $grub_manage {
 		file { '/etc/default/grub':