X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/307adfed3045a1673b09bccce74acaaf530d3c9b..d8b4922ddbdd6b29980ce67ff75850783be28534:/cookbooks/munin/recipes/default.rb

diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb
index 3b41eb8e9..9a6b6e696 100644
--- a/cookbooks/munin/recipes/default.rb
+++ b/cookbooks/munin/recipes/default.rb
@@ -20,11 +20,6 @@
 package "munin-node"
 
 service "munin-node" do
-  if node[:lsb][:release].to_f >= 15.10
-    provider Chef::Provider::Service::Systemd
-  elsif node[:lsb][:release].to_f >= 14.04
-    provider Chef::Provider::Service::Upstart
-  end
   action [:enable, :start]
   supports :status => true, :restart => true, :reload => true
 end
@@ -162,7 +157,9 @@ 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] &&
+       node[:hardware][:network][ifname][:device] =~ /^virtio/
       munin_plugin_conf "if_#{ifname}" do
         template "if.erb"
         variables :ifname => ifname
@@ -210,7 +207,6 @@ if Dir.glob("/dev/ipmi*").empty?
 
   munin_plugin "ipmi_power" do
     action :delete
-    only_if { node[:lsb][:release].to_f >= 14.04 }
   end
 else
   munin_plugin_conf "ipmi" do
@@ -227,7 +223,6 @@ else
 
   munin_plugin "ipmi_power" do
     target "ipmi_"
-    only_if { node[:lsb][:release].to_f >= 14.04 }
   end
 end