From d032f1cf940533b94af25bef690d3a9ba0fd51f9 Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Sun, 3 Feb 2019 01:22:02 +0100 Subject: [PATCH] Do not setup grub/kernel serial console on ppc64el VMs On ppc64el VMs, grub and the kernel automatically switch to the serial console if there is no video card. OTOH the serial console is not called ttyS0, so it's better to not try to setup it up manually. --- modules/grub/manifests/init.pp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/grub/manifests/init.pp b/modules/grub/manifests/init.pp index 9362e4df5..73b348220 100644 --- a/modules/grub/manifests/init.pp +++ b/modules/grub/manifests/init.pp @@ -3,8 +3,10 @@ class grub { if ($::kernel == 'Linux' and $::is_virtual and $::virtual == 'kvm') { $grub_manage = true - $grub_do_kernel_serial = true - $grub_do_grub_serial = true + if ($::debarchitecture != 'ppc64el') { + $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,clementi,czerny,lw01,lw02,lw03,lw04,lw07,lw08,lw09,lw10] { $grub_manage = true $grub_do_kernel_serial = true -- 2.20.1