projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move listen-address information out of manifest and into hiera
[mirror/dsa-puppet.git]
/
modules
/
grub
/
manifests
/
init.pp
diff --git
a/modules/grub/manifests/init.pp
b/modules/grub/manifests/init.pp
index
f0fa84a
..
73ec4ec
100644
(file)
--- a/
modules/grub/manifests/init.pp
+++ b/
modules/grub/manifests/init.pp
@@
-25,10
+25,12
@@
class grub {
$grub_manage = false
}
$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)
# hp-health requires nopat on linux 4.9
$grub_do_nopat = ($::systemproductname and $::systemproductname =~ /^ProLiant/ and versioncmp($::kernelversion, '4.9') >= 0)
+ $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':
$grub_do_extra = $::hostname in [fasolo,grnet-node01,grnet-node02]
file { '/etc/default/grub':
@@
-75,6
+77,12
@@
class grub {
content => template('grub/puppet-kernel-extra.cfg.erb'),
notify => Exec['update-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':
}
exec { 'update-grub':