X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fgrub%2Fmanifests%2Finit.pp;h=9761b63c4fa2bcf20e58c2fedb593241ff180c50;hb=c411bff87018e2fffcc85ae52f42740b3e2fd378;hp=989d44423f6c09409273c227e7192d340b2e1a23;hpb=736e39525d7e31ad3808478653ac2cdad039c6c8;p=mirror%2Fdsa-puppet.git

diff --git a/modules/grub/manifests/init.pp b/modules/grub/manifests/init.pp
index 989d44423..9761b63c4 100644
--- a/modules/grub/manifests/init.pp
+++ b/modules/grub/manifests/init.pp
@@ -5,11 +5,11 @@ class grub {
 		$grub_manage = true
 		$grub_do_kernel_serial = true
 		$grub_do_grub_serial = true
-	} 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] {
+	} 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,grnet-node01,grnet-node02,csail-node01,csail-node02,byrd,mirror-isc,mirror-umn,lobos,villa] {
 		$grub_manage = true
 		$grub_do_kernel_serial = true
 		$grub_do_grub_serial = true
-	} elsif $::hostname in [mirror-skroutz,aagaard,acker,arm-arm-01,fasolo] {
+	} elsif $::hostname in [mirror-skroutz,conova-node01,conova-node02,arm-arm-01,fasolo] {
 		$grub_manage = true
 		$grub_do_kernel_serial = true
 		$grub_do_grub_serial = true
@@ -17,17 +17,17 @@ class grub {
 		$grub_manage = true
 		$grub_do_kernel_serial = true
 		$grub_do_grub_serial = false
-	} elsif $::hostname in [villa] {
-		$grub_manage = true
-		$grub_do_kernel_serial = false
-		$grub_do_grub_serial = false
+	#} elsif $::hostname in [villa] {
+	#	$grub_manage = true
+	#	$grub_do_kernel_serial = false
+	#	$grub_do_grub_serial = false
 	} else {
 		$grub_manage = false
 	}
 
 	if $grub_manage {
 		# hp-health requires nopat on linux 4.9
-		$grub_do_nopat = ($::systemproductname =~ /^ProLiant/ and versioncmp($::kernelversion, '4.9') >= 0)
+		$grub_do_nopat = ($::systemproductname and $::systemproductname =~ /^ProLiant/ and versioncmp($::kernelversion, '4.9') >= 0)
 
 		$grub_do_extra = $::hostname in [fasolo]