From d07d87a1ec02405fa5fbf3514390eb5a706efce1 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Fri, 18 Aug 2017 15:46:09 +0200 Subject: [PATCH] fix templates --- modules/grub/templates/puppet-kernel-extra.cfg.erb | 2 +- modules/grub/templates/puppet-kernel-serial.cfg.erb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/grub/templates/puppet-kernel-extra.cfg.erb b/modules/grub/templates/puppet-kernel-extra.cfg.erb index 58f3ab0db..140bb95b3 100644 --- a/modules/grub/templates/puppet-kernel-extra.cfg.erb +++ b/modules/grub/templates/puppet-kernel-extra.cfg.erb @@ -1,3 +1,3 @@ -<%- if %w{fasolo}.include?(hostname) then -%> +<%- if %w{fasolo}.include?(@hostname) then -%> GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX elevator=deadline" <%- end -%> diff --git a/modules/grub/templates/puppet-kernel-serial.cfg.erb b/modules/grub/templates/puppet-kernel-serial.cfg.erb index f35ad04b7..55ff4a0cd 100644 --- a/modules/grub/templates/puppet-kernel-serial.cfg.erb +++ b/modules/grub/templates/puppet-kernel-serial.cfg.erb @@ -1,8 +1,8 @@ -<%- if %w{arm-conova-01 arm-arm-01}.include?(hostname) then -%> +<%- if %w{arm-conova-01 arm-arm-01}.include?(@hostname) then -%> GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=ttyAMA0,115200n8" -<%- elsif %w{arm-arm-03}.include?(hostname) then -%> +<%- elsif %w{arm-arm-03}.include?(@hostname) then -%> GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=ttyS0,115200" -<%- elsif %w{aagaard acker}.include?(hostname) then -%> +<%- elsif %w{aagaard acker}.include?(@hostname) then -%> GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=ttyS0,115200 earlycon" <% else -%> GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=tty0 console=ttyS0,115200n8" -- 2.20.1