X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fgrub%2Fmanifests%2Finit.pp;h=7d9a1816f5a23e3aaf09d60d4cbc9b6c72e4f710;hb=9e1f74ad62a130347719115d4248d0dc1170d0c2;hp=c4db78f48559be206e4f0cf3a353eae98f83f06b;hpb=ace665bc01241d6062543f11e2072762119d4e57;p=mirror%2Fdsa-puppet.git

diff --git a/modules/grub/manifests/init.pp b/modules/grub/manifests/init.pp
index c4db78f48..7d9a1816f 100644
--- a/modules/grub/manifests/init.pp
+++ b/modules/grub/manifests/init.pp
@@ -1,33 +1,33 @@
 class grub {
+	$grub_do_ifnames = ($::kernel == 'Linux' and $::is_virtual and $::virtual == 'kvm')
+
 	if ($::kernel == 'Linux' and $::is_virtual and $::virtual == 'kvm') {
 		$grub_manage = true
 		$grub_do_kernel_serial = true
 		$grub_do_grub_serial = true
-		$grub_do_ifnames = true
-	} elsif $::hostname in [ubc-enc2bl01,ubc-enc2bl02,ubc-enc2bl09,ubc-enc2bl10,casulana,mirror-anu,sallinen,storace,mirror-accumu] {
+	} elsif $::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] {
 		$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] {
+	} elsif $::hostname in [arm-arm-03] {
 		$grub_manage = true
 		$grub_do_kernel_serial = true
 		$grub_do_grub_serial = false
-		$grub_do_nopat = false
+	} elsif $::hostname in [villa] {
+		$grub_manage = true
+		$grub_do_kernel_serial = false
+		$grub_do_grub_serial = false
 	} else {
 		$grub_manage = false
 	}
 
-	if $::hostname in [fasolo] {
-		$grub_do_extra = true
-	} else {
-		$grub_do_extra = 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 {
 		file { '/etc/default/grub':
@@ -37,7 +37,12 @@ class grub {
 		}
 
 		file { '/etc/default/grub.d':
-			ensure => directory
+			ensure => directory,
+			mode   => '0555',
+			purge   => true,
+			force   => true,
+			recurse => true,
+			source  => 'puppet:///files/empty/',
 		}
 
 		file { '/etc/default/grub.d/puppet-grub-serial.cfg':