manage grub on arm-arm-03

diff --git a/modules/grub/manifests/init.pp b/modules/grub/manifests/init.pp
index 4a55bba..74fb539 100644 (file)
--- a/modules/grub/manifests/init.pp
+++ b/modules/grub/manifests/init.pp
@@ -14,6 +14,11 @@ class grub {
                $grub_do_kernel_serial = true
                $grub_do_grub_serial = true
                $grub_do_nopat = false
+       } elsif $::hostname in [acker,arm-arm-03] {
+               $grub_manage = true
+               $grub_do_kernel_serial = true
+               $grub_do_grub_serial = false
+               $grub_do_nopat = false
        } else {
                $grub_manage = false
        }

diff --git a/modules/grub/templates/puppet-kernel-serial.cfg.erb b/modules/grub/templates/puppet-kernel-serial.cfg.erb
index 4d03940..f35ad04 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{arm-arm-03}.include?(hostname) then -%>
+GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=ttyS0,115200"
 <%- elsif %w{aagaard acker}.include?(hostname) then -%>
 GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=ttyS0,115200 earlycon"
 <% else -%>