only manage grub if we have it

diff --git a/modules/debian_org/lib/facter/software.rb b/modules/debian_org/lib/facter/software.rb
index 169436a..595d44a 100644 (file)
--- a/modules/debian_org/lib/facter/software.rb
+++ b/modules/debian_org/lib/facter/software.rb
@@ -172,3 +172,8 @@ Facter.add("zebra") do
                FileTest.exist?("/usr/sbin/zebra")
        end
 end
+Facter.add("update_grub") do
+       setcode do
+               FileTest.exist?("/usr/sbin/update-grub")
+       end
+end

diff --git a/modules/grub/manifests/init.pp b/modules/grub/manifests/init.pp
index 51f3f87..73ec4ec 100644 (file)
--- a/modules/grub/manifests/init.pp
+++ b/modules/grub/manifests/init.pp
@@ -25,7 +25,7 @@ class grub {
                $grub_manage = false
        }
 
-       if $grub_manage {
+       if ($::update_grub and $grub_manage) {
                # hp-health requires nopat on linux 4.9
                $grub_do_nopat = ($::systemproductname and $::systemproductname =~ /^ProLiant/ and versioncmp($::kernelversion, '4.9') >= 0)