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

diff --git a/modules/grub/manifests/init.pp b/modules/grub/manifests/init.pp
index 74fb539da..c4db78f48 100644
--- a/modules/grub/manifests/init.pp
+++ b/modules/grub/manifests/init.pp
@@ -9,7 +9,7 @@ class grub {
 		$grub_do_kernel_serial = true
 		$grub_do_grub_serial = true
 		$grub_do_nopat = true
-	} elsif $::hostname in [mirror-skroutz,aagard,acker,arm-arm-01] {
+	} elsif $::hostname in [mirror-skroutz,aagaard,acker,arm-arm-01,fasolo] {
 		$grub_manage = true
 		$grub_do_kernel_serial = true
 		$grub_do_grub_serial = true
@@ -23,6 +23,11 @@ class grub {
 		$grub_manage = false
 	}
 
+	if $::hostname in [fasolo] {
+		$grub_do_extra = true
+	} else {
+		$grub_do_extra = false
+	}
 
 	if $grub_manage {
 		file { '/etc/default/grub':
@@ -58,6 +63,12 @@ class grub {
 			content  => template('grub/puppet-kernel-nopat.cfg.erb'),
 			notify  => Exec['update-grub']
 		}
+
+		file { '/etc/default/grub.d/puppet-kernel-extra.cfg':
+			ensure => $grub_do_extra ? { true  => 'present', default => 'absent' },
+			content  => template('grub/puppet-kernel-extra.cfg.erb'),
+			notify  => Exec['update-grub']
+		}
 	}
 
 	exec { 'update-grub':