X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fgrub%2Fmanifests%2Finit.pp;h=7e41b62da4e8559eb3ff6d5b73d345c107f840e7;hb=849fd4fb3c110bb6ee9270de17b859d323c45c07;hp=1ef9ec783cfc68e2d9ba47d2a3c96a3528034512;hpb=e97ada246f6bbbdb8007d1156db9007b518aaf43;p=mirror%2Fdsa-puppet.git

diff --git a/modules/grub/manifests/init.pp b/modules/grub/manifests/init.pp
index 1ef9ec783..7e41b62da 100644
--- a/modules/grub/manifests/init.pp
+++ b/modules/grub/manifests/init.pp
@@ -1,25 +1,49 @@
 class grub {
 	if ($::kernel == 'Linux' and $::is_virtual and $::virtual == 'kvm') {
+		$grub_manage = true
+		$grub_do_serial = true
+		$grub_do_ifnames = true
+	} elsif $::hostname in [ubc-enc2bl01,ubc-enc2bl02,ubc-enc2bl09,ubc-enc2bl10] {
+		$grub_manage = true
+		$grub_do_serial = true
+		$grub_do_nopat = true
+	} else {
+		$grub_manage = false
+	}
+
+
+	if $grub_manage {
 		file { '/etc/default/grub':
 			# restore to default
 			source => 'puppet:///modules/grub/etc-default-grub',
 			notify  => Exec['update-grub']
 		}
+
 		file { '/etc/default/grub.d':
 			ensure => directory
 		}
+
 		file { '/etc/default/grub.d/puppet-grub-serial.cfg':
+			ensure => $grub_do_serial ? { true  => 'present', default => 'absent' },
 			content  => template('grub/puppet-grub-serial.cfg.erb'),
 			notify  => Exec['update-grub']
 		}
+
 		file { '/etc/default/grub.d/puppet-net-ifnames.cfg':
+			ensure => $grub_do_ifnames ? { true  => 'present', default => 'absent' },
 			content  => template('grub/puppet-net-ifnames.cfg.erb'),
 			notify  => Exec['update-grub']
 		}
 
-		exec { 'update-grub':
-			refreshonly => true,
-			path        => '/usr/bin:/usr/sbin:/bin:/sbin',
+		file { '/etc/default/grub.d/puppet-kernel-nopat.cfg':
+			ensure => $grub_do_nopat ? { true  => 'present', default => 'absent' },
+			content  => template('grub/puppet-kernel-nopat.cfg.erb'),
+			notify  => Exec['update-grub']
 		}
 	}
+
+	exec { 'update-grub':
+		refreshonly => true,
+		path        => '/usr/bin:/usr/sbin:/bin:/sbin',
+	}
 }