Merge remote-tracking branch 'origin/master' into zobel-salsa

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

diff --git a/modules/grub/manifests/init.pp b/modules/grub/manifests/init.pp
index a325797..73ec4ec 100644 (file)
--- a/modules/grub/manifests/init.pp
+++ b/modules/grub/manifests/init.pp
@@ -25,11 +25,13 @@ class grub {
                $grub_manage = false
        }
 
-       if $grub_manage {
+       if ($::update_grub and $grub_manage) {
                # hp-health requires nopat on linux 4.9
                $grub_do_nopat = ($::systemproductname and $::systemproductname =~ /^ProLiant/ and versioncmp($::kernelversion, '4.9') >= 0)
 
-               $grub_do_extra = $::hostname in [fasolo]
+               $grub_do_pti_on = ($::debarchitecture == 'amd64' and versioncmp($::lsbmajdistrelease, '9') >= 0)
+
+               $grub_do_extra = $::hostname in [fasolo,grnet-node01,grnet-node02]
 
                file { '/etc/default/grub':
                        # restore to default
@@ -75,6 +77,12 @@ class grub {
                        content  => template('grub/puppet-kernel-extra.cfg.erb'),
                        notify  => Exec['update-grub']
                }
+
+               file { '/etc/default/grub.d/puppet-kernel-pti-on.cfg':
+                       ensure => $grub_do_pti_on ? { true  => 'present', default => 'absent' },
+                       content  => template('grub/puppet-kernel-pti-on.cfg.erb'),
+                       notify  => Exec['update-grub']
+               }
        }
 
        exec { 'update-grub':