From c790002ad0294b39624c17dcd55854362aa6307d Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Fri, 18 Aug 2017 15:44:41 +0200 Subject: [PATCH] fasolo grub --- modules/grub/manifests/init.pp | 13 ++++++++++++- modules/grub/templates/puppet-kernel-extra.cfg.erb | 3 +++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 modules/grub/templates/puppet-kernel-extra.cfg.erb diff --git a/modules/grub/manifests/init.pp b/modules/grub/manifests/init.pp index 74fb539da..2cc092fc3 100644 --- a/modules/grub/manifests/init.pp +++ b/modules/grub/manifests/init.pp @@ -9,7 +9,7 @@ class grub { $grub_do_kernel_serial = true $grub_do_grub_serial = true $grub_do_nopat = true - } elsif $::hostname in [mirror-skroutz,aagard,acker,arm-arm-01] { + } elsif $::hostname in [mirror-skroutz,aagard,acker,arm-arm-01,fasolo] { $grub_manage = true $grub_do_kernel_serial = true $grub_do_grub_serial = true @@ -23,6 +23,11 @@ class grub { $grub_manage = false } + if $::hostname in [fasolo] { + $grub_do_extra = true + } else { + $grub_do_extra = false + } if $grub_manage { file { '/etc/default/grub': @@ -58,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': diff --git a/modules/grub/templates/puppet-kernel-extra.cfg.erb b/modules/grub/templates/puppet-kernel-extra.cfg.erb new file mode 100644 index 000000000..58f3ab0db --- /dev/null +++ b/modules/grub/templates/puppet-kernel-extra.cfg.erb @@ -0,0 +1,3 @@ +<%- if %w{fasolo}.include?(hostname) then -%> +GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX elevator=deadline" +<%- end -%> -- 2.20.1