Update rubocop

[chef.git] / cookbooks / munin / recipes / default.rb

diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb
index fb98079315f593c6c5a70350ad3e54815067a2be..39085f0e2f8efc32a400440a05457fad4662ef7f 100644 (file)
--- a/cookbooks/munin/recipes/default.rb
+++ b/cookbooks/munin/recipes/default.rb
@@ -162,7 +162,9 @@ end
 
 node[:network][:interfaces].each do |ifname, ifattr|
   if ifattr[:encapsulation] == "Ethernet" && ifattr[:state] == "up"
 
 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] &&
+       node[:hardware][:network][ifname][:device] =~ /^virtio/

       munin_plugin_conf "if_#{ifname}" do
         template "if.erb"
         variables :ifname => ifname
       munin_plugin_conf "if_#{ifname}" do
         template "if.erb"
         variables :ifname => ifname


@@ -291,9 +293,7 @@ Dir.glob("/sys/class/hwmon/hwmon*").each do |hwmon|
   sensors_volt = true unless Dir.glob("#{hwmon}/in*_input").empty?
 end
 
   sensors_volt = true unless Dir.glob("#{hwmon}/in*_input").empty?
 end
 

-if sensors_fan || sensors_temp || sensors_volt
-  package "lm-sensors"
-end
+package "lm-sensors" if sensors_fan || sensors_temp || sensors_volt

 
 if sensors_fan
   munin_plugin "sensors_fan" do
 
 if sensors_fan
   munin_plugin "sensors_fan" do