Don't set grub_do_nopat or grub_do_extra unless grub_manage is set

diff --git a/modules/grub/manifests/init.pp b/modules/grub/manifests/init.pp
index 7d9a181..989d444 100644 (file)
--- a/modules/grub/manifests/init.pp
+++ b/modules/grub/manifests/init.pp
@@ -25,11 +25,12 @@ class grub {
                $grub_manage = false
        }
 
-       # hp-health requires nopat on linux 4.9
-       $grub_do_nopat = ($::systemproductname =~ /^ProLiant/ and versioncmp($::kernelversion, '4.9') >= 0)
-       $grub_do_extra = $::hostname in [fasolo]
-
        if $grub_manage {
+               # hp-health requires nopat on linux 4.9
+               $grub_do_nopat = ($::systemproductname =~ /^ProLiant/ and versioncmp($::kernelversion, '4.9') >= 0)
+
+               $grub_do_extra = $::hostname in [fasolo]
+
                file { '/etc/default/grub':
                        # restore to default
                        source => 'puppet:///modules/grub/etc-default-grub',