Set grub config on mirror-isc

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

diff --git a/modules/grub/manifests/init.pp b/modules/grub/manifests/init.pp
index 8e0e097..d23e3e8 100644 (file)
--- a/modules/grub/manifests/init.pp
+++ b/modules/grub/manifests/init.pp
@@ -13,18 +13,24 @@ 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,mirror-isc] {
+               $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,villa]
-       $grub_do_extra = $::hostname in [fasolo]
-
        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',