Disable mcelog on scorch

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

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index 4710e5ef5494675d2c62c457af84453cc00443a9..a18a293a04a01b461c5100fb6a0fab9a531632e6 100644 (file)
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -21,7 +21,7 @@ include_recipe "tools"
 include_recipe "munin"
 
 ohai_plugin "hardware" do
-  template "ohai.rb.erb"
+  template_source "ohai.rb.erb"
 end
 
 case node[:cpu][:"0"][:vendor_id]
@@ -200,20 +200,22 @@ service "lldpd" do
   supports :status => true, :restart => true, :reload => true
 end
 
-package "mcelog"
+if node[:hardware][:mcelog][:enabled]
+  package "mcelog"
 
-%w[bus cache dimm iomca page socket-memory unknown].each do |trigger|
-  template "/etc/mcelog/#{trigger}-error-trigger.local" do
-    source "mcelog-trigger.erb"
-    owner "root"
-    group "root"
-    mode 0o755
+  %w[bus cache dimm iomca page socket-memory unknown].each do |trigger|
+    template "/etc/mcelog/#{trigger}-error-trigger.local" do
+      source "mcelog-trigger.erb"
+      owner "root"
+      group "root"
+      mode 0o755
+    end
   end
-end
 
-service "mcelog" do
-  action [:start, :enable]
-  supports :status => true, :restart => true, :reload => false
+  service "mcelog" do
+    action [:start, :enable]
+    supports :status => true, :restart => true, :reload => false
+  end
 end
 
 tools_packages = []
@@ -424,7 +426,7 @@ if disks.count.positive?
   # an Areca controller as they only allow one thing to
   # talk to the controller at a time and smartd will
   # throw errors if it clashes with munin
-  disks = disks.reject { |disk| disk[:smart] && disk[:smart].start_with?("areca,") }
+  disks = disks.reject { |disk| disk[:smart]&.start_with?("areca,") }
 
   disks.each do |disk|
     munin_plugin "smart_#{disk[:munin]}" do