X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fgrub%2Fmanifests%2Finit.pp;h=d23e3e8cdcee16e3590c8c2b466a9c2ce111b2c9;hb=d8857059f0984640f6d6fc0db0628921e842c199;hp=1f6e7e6be1921f089f8aed075a2bc5306c670053;hpb=0e6252a0ed154daa6ef6b1514db85b9e66b84706;p=mirror%2Fdsa-puppet.git diff --git a/modules/grub/manifests/init.pp b/modules/grub/manifests/init.pp index 1f6e7e6be..d23e3e8cd 100644 --- a/modules/grub/manifests/init.pp +++ b/modules/grub/manifests/init.pp @@ -1,25 +1,84 @@ class grub { - if ($::kernel == 'Linux' and $::virt == 'kvm') { + $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 + } 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 + } elsif $::hostname in [mirror-skroutz,aagaard,acker,arm-arm-01,fasolo] { + $grub_manage = true + $grub_do_kernel_serial = true + $grub_do_grub_serial = true + } elsif $::hostname in [arm-arm-03] { + $grub_manage = true + $grub_do_kernel_serial = true + $grub_do_grub_serial = false + } elsif $::hostname in [villa,mirror-isc] { + $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_extra = $::hostname in [fasolo] + 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 + ensure => directory, + mode => '0555', + purge => true, + force => true, + recurse => true, + source => 'puppet:///files/empty/', } + file { '/etc/default/grub.d/puppet-grub-serial.cfg': + ensure => $grub_do_kernel_serial ? { true => 'present', default => 'absent' }, content => template('grub/puppet-grub-serial.cfg.erb'), notify => Exec['update-grub'] } + + file { '/etc/default/grub.d/puppet-kernel-serial.cfg': + ensure => $grub_do_grub_serial ? { true => 'present', default => 'absent' }, + content => template('grub/puppet-kernel-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'] + } + + 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': + refreshonly => true, + path => '/usr/bin:/usr/sbin:/bin:/sbin', + } }