From: Tom Hughes <tom@compton.nu>
Date: Thu, 27 Oct 2016 08:29:03 +0000 (+0100)
Subject: Don't rely on ohai hardware plugin having been run
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/0a97a0dc8db53359fee0af041c4608a212b0c30f

Don't rely on ohai hardware plugin having been run
---

diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb
index 3b41eb8e9..1b4ae6d75 100644
--- a/cookbooks/munin/recipes/default.rb
+++ b/cookbooks/munin/recipes/default.rb
@@ -162,7 +162,7 @@ end
 
 node[:network][:interfaces].each do |ifname, ifattr|
   if ifattr[:encapsulation] == "Ethernet" && ifattr[:state] == "up"
-    if node[:hardware][:network][ifname][:device] =~ /^virtio/
+    if node[:hardware] && node[:hardware][:network][ifname][:device] =~ /^virtio/
       munin_plugin_conf "if_#{ifname}" do
         template "if.erb"
         variables :ifname => ifname