Remove remnants of mcelog

mcelog was replaced by rasdaemon in Ubuntu 18.04 but old installs
where previously never cleaned up.

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index dd4448180e287a900e58773495124dc3fee9e7f8..23e0d2105fe0722eb21339e5f25db22409ebac5c 100644 (file)
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -225,6 +225,20 @@ ohai_plugin "lldp" do
   template "lldp.rb.erb"
 end
 
+%w[bus cache dimm iomca page socket-memory unknown].each do |trigger|
+  file "/etc/mcelog/#{trigger}-error-trigger.local" do
+    action :delete
+  end
+end
+
+service "mcelog" do
+  action [:stop, :disable]
+end
+
+package "mcelog" do
+  action :purge
+end
+
 tools_packages = []
 status_packages = {}
 

diff --git a/cookbooks/hardware/templates/default/mcelog-trigger.erb b/cookbooks/hardware/templates/default/mcelog-trigger.erb
deleted file mode 100644 (file)
index 463b390..0000000
--- a/cookbooks/hardware/templates/default/mcelog-trigger.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-# DO NOT EDIT - This file is being maintained by Chef
-
-echo "$MESSAGE" | /usr/bin/mail -s "Machine Check Exception for <%= node[:fqdn] %>" admins@openstreetmap.org

diff --git a/roles/scorch.rb b/roles/scorch.rb
index 36b8e4450dd79515b7610933080393a98d34f8d2..86c38424ef63bec8f719bce2c0e8ab589ad28c73 100644 (file)
--- a/roles/scorch.rb
+++ b/roles/scorch.rb
@@ -15,11 +15,6 @@ default_attributes(
       }
     }
   },
-  :hardware => {
-    :mcelog => {
-      :enabled => false
-    }
-  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {

diff --git a/roles/shenron.rb b/roles/shenron.rb
index c57441b1149a6adc62090b4c8a93d40d302b3552..c82e4cd211adfa60ee3cd3fbc92385b1d9a6e841 100644 (file)
--- a/roles/shenron.rb
+++ b/roles/shenron.rb
@@ -15,9 +15,6 @@ default_attributes(
         :ignore => %w[in6]
       }
     },
-    :mcelog => {
-      :enabled => false
-    },
     :modules => [
       "it87"
     ]