spell aagaard right

[mirror/dsa-puppet.git] / modules / grub / manifests / init.pp

diff --git a/modules/grub/manifests/init.pp b/modules/grub/manifests/init.pp
index f5e21c4..c4db78f 100644 (file)
--- a/modules/grub/manifests/init.pp
+++ b/modules/grub/manifests/init.pp
@@ -4,20 +4,30 @@ class grub {
                $grub_do_kernel_serial = true
                $grub_do_grub_serial = true
                $grub_do_ifnames = true
-       } elsif $::hostname in [ubc-enc2bl01,ubc-enc2bl02,ubc-enc2bl09,ubc-enc2bl10,casulana,mirror-anu,sallinen,storace,mirror-skroutz] {
+       } elsif $::hostname in [ubc-enc2bl01,ubc-enc2bl02,ubc-enc2bl09,ubc-enc2bl10,casulana,mirror-anu,sallinen,storace,mirror-accumu] {
                $grub_manage = true
                $grub_do_kernel_serial = true
                $grub_do_grub_serial = true
                $grub_do_nopat = true
-       } elsif $::hostname in [mirror-accumu] {
+       } elsif $::hostname in [mirror-skroutz,aagaard,acker,arm-arm-01,fasolo] {
                $grub_manage = true
                $grub_do_kernel_serial = true
                $grub_do_grub_serial = true
-               $grub_do_nopat = true
+               $grub_do_nopat = false
+       } elsif $::hostname in [acker,arm-arm-03] {
+               $grub_manage = true
+               $grub_do_kernel_serial = true
+               $grub_do_grub_serial = false
+               $grub_do_nopat = false
        } else {
                $grub_manage = false
        }
 
+       if $::hostname in [fasolo] {
+               $grub_do_extra = true
+       } else {
+               $grub_do_extra = false
+       }
 
        if $grub_manage {
                file { '/etc/default/grub':
@@ -53,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':