X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fgrub%2Fmanifests%2Finit.pp;h=3eeb828ef8df388a68a8b83dd2e9602471008667;hb=993f7f1e8a4eb1cbe5fafa3dbb256fcb5b4253f3;hp=7218216fc21cb6fa6980fec078213cce92238fa2;hpb=8c901a6242d5c3759ce931d012e81ff3f9b36e1e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/grub/manifests/init.pp b/modules/grub/manifests/init.pp
index 7218216fc..3eeb828ef 100644
--- a/modules/grub/manifests/init.pp
+++ b/modules/grub/manifests/init.pp
@@ -13,15 +13,19 @@ class grub {
 		$grub_manage = true
 		$grub_do_kernel_serial = true
 		$grub_do_grub_serial = true
-	} 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
+	} elsif $::hostname in [villa] {
+		$grub_manage = true
+		$grub_do_kernel_serial = false
+		$grub_do_grub_serial = false
 	} else {
 		$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]
+	$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]
 	$grub_do_extra = $::hostname in [fasolo]
 
 	if $grub_manage {