Avoid undefined use of $grub_do_ifnames
authorPeter Palfrader <peter@palfrader.org>
Fri, 1 Sep 2017 17:28:52 +0000 (17:28 +0000)
committerPeter Palfrader <peter@palfrader.org>
Fri, 1 Sep 2017 17:28:52 +0000 (17:28 +0000)
modules/grub/manifests/init.pp

index bf6c9e2..7218216 100644 (file)
@@ -1,9 +1,10 @@
 class grub {
+       $grub_do_ifnames = ($::kernel == 'Linux' and $::is_virtual and $::virtual == 'kvm')
+
        if ($::kernel == 'Linux' and $::is_virtual and $::virtual == 'kvm') {
                $grub_manage = true
                $grub_do_kernel_serial = true
                $grub_do_grub_serial = true
-               $grub_do_ifnames = 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] {
                $grub_manage = true
                $grub_do_kernel_serial = true