serial options that work on clementi hopefully will also work on czerny

diff --git a/modules/grub/manifests/init.pp b/modules/grub/manifests/init.pp
index 79abb91..a325797 100644 (file)
--- a/modules/grub/manifests/init.pp
+++ b/modules/grub/manifests/init.pp
@@ -5,7 +5,7 @@ class grub {
                $grub_manage = true
                $grub_do_kernel_serial = true
                $grub_do_grub_serial = true
-       } elsif $::hostname in [ubc-enc2bl01,ubc-enc2bl02,ubc-enc2bl09,ubc-enc2bl10,casulana,mirror-anu,sallinen,storace,mirror-accumu,bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,bm-bl9,bm-bl10,bm-bl11,bm-bl12,bm-bl13,bm-bl14,grnet-node01,grnet-node02,csail-node01,csail-node02,byrd,mirror-isc,mirror-umn,lobos,villa,klecker] {
+       } elsif $::hostname in [ubc-enc2bl01,ubc-enc2bl02,ubc-enc2bl09,ubc-enc2bl10,casulana,mirror-anu,sallinen,storace,mirror-accumu,bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,bm-bl9,bm-bl10,bm-bl11,bm-bl12,bm-bl13,bm-bl14,grnet-node01,grnet-node02,csail-node01,csail-node02,byrd,mirror-isc,mirror-umn,lobos,villa,klecker,clementi,czerny] {
                $grub_manage = true
                $grub_do_kernel_serial = true
                $grub_do_grub_serial = true
@@ -17,10 +17,6 @@ class grub {
                $grub_manage = true
                $grub_do_kernel_serial = true
                $grub_do_grub_serial = false
-       } elsif $::hostname in [clementi,czerny] {
-               $grub_manage = true
-               $grub_do_kernel_serial = false
-               $grub_do_grub_serial = false
        #} elsif $::hostname in [villa] {
        #       $grub_manage = true
        #       $grub_do_kernel_serial = false

diff --git a/modules/grub/templates/puppet-grub-serial.cfg.erb b/modules/grub/templates/puppet-grub-serial.cfg.erb
index 3bbc9c7..6d43cbd 100644 (file)
--- a/modules/grub/templates/puppet-grub-serial.cfg.erb
+++ b/modules/grub/templates/puppet-grub-serial.cfg.erb
@@ -1,5 +1,5 @@
 GRUB_TERMINAL="serial console"
-<%- if %w{storace klecker}.include?(@hostname) then -%>
+<%- if %w{storace klecker clementi czerny}.include?(@hostname) then -%>
 GRUB_SERIAL_COMMAND="serial --unit=1 --speed=115200 --word=8 --parity=no --stop=1"
 <% else -%>
 GRUB_SERIAL_COMMAND="serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1"

diff --git a/modules/grub/templates/puppet-kernel-serial.cfg.erb b/modules/grub/templates/puppet-kernel-serial.cfg.erb
index fcc8271..83e9754 100644 (file)
--- a/modules/grub/templates/puppet-kernel-serial.cfg.erb
+++ b/modules/grub/templates/puppet-kernel-serial.cfg.erb
@@ -4,7 +4,7 @@ GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=ttyAMA0,115200n8"
 GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=ttyS0,115200"
 <%- elsif %w{conova-node01 conova-node02}.include?(@hostname) then -%>
 GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=ttyS0,115200 earlycon"
-<%- elsif %w{storace klecker}.include?(@hostname) then -%>
+<%- elsif %w{storace klecker clementi czerny}.include?(@hostname) then -%>
 GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=tty0 console=ttyS1,115200n8"
 <% else -%>
 GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=tty0 console=ttyS0,115200n8"