aagard, acker grub

diff --git a/modules/grub/manifests/init.pp b/modules/grub/manifests/init.pp
index 1c9f2c9..a77c136 100644 (file)
--- 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] {
+       } elsif $::hostname in [mirror-skroutz,aagard,acker] {
                $grub_manage = true
                $grub_do_kernel_serial = true
                $grub_do_grub_serial = true

diff --git a/modules/grub/templates/puppet-kernel-serial.cfg.erb b/modules/grub/templates/puppet-kernel-serial.cfg.erb
index 0a085ef..4d03940 100644 (file)
--- a/modules/grub/templates/puppet-kernel-serial.cfg.erb
+++ b/modules/grub/templates/puppet-kernel-serial.cfg.erb
@@ -1,5 +1,7 @@
 <%- if %w{arm-conova-01 arm-arm-01}.include?(hostname) then -%>
 GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=ttyAMA0,115200n8"
+<%- 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"
 <%- end -%>