Blacklist acpi_power_meter on G6 machines

diff --git a/cookbooks/hardware/attributes/default.rb b/cookbooks/hardware/attributes/default.rb
index 00886cc22eb106cdd8ffe7d765af3b2c5a93a8e0..f0b0f73b1fe2316dbbfb08c2379df655b1ea802f 100644 (file)
--- a/cookbooks/hardware/attributes/default.rb
+++ b/cookbooks/hardware/attributes/default.rb
@@ -1,4 +1,5 @@
 default[:hardware][:modules] = %w[lp]
+default[:hardware][:blacklisted_modules] = %w[]
 default[:hardware][:grub][:cmdline] = %w[nomodeset]
 default[:hardware][:sensors] = {}
 default[:hardware][:hwmon] = {}

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index 633edcb19cd2f1b74a53d5ca419a9a62256920c0..7736cd507c7aa6a34a6bcfa9cc84a47768a11948 100644 (file)
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -550,6 +550,12 @@ node[:hardware][:modules].each do |module_name|
   end
 end
 
+node[:hardware][:blacklisted_modules].each do |module_name|
+  kernel_module module_name do
+    action :blacklist
+  end
+end
+
 if node[:hardware][:watchdog]
   package "watchdog"
 

diff --git a/roles/hp-dl180-g6.rb b/roles/hp-dl180-g6.rb
index 2c64ec8e43472a04db6072cff2ac175080f0086a..20125bb34e45ce66f2a1f18f67829e7c644fe77d 100644 (file)
--- a/roles/hp-dl180-g6.rb
+++ b/roles/hp-dl180-g6.rb
@@ -2,6 +2,9 @@ name "hp-dl180-g6"
 description "Role applied to all HP DL180 G6 machines"
 
 default_attributes(
+  :hardware => {
+    :blacklisted_modules => %w[acpi_power_meter]
+  },
   :munin => {
     :plugins => {
       :hpasmcli2_fans => {

diff --git a/roles/hp-dl360-g6.rb b/roles/hp-dl360-g6.rb
index 0c27aca8ef86744f154820eb44a96626552b7abb..c7a14cda43d48ee589d8c54c2357f60669789242 100644 (file)
--- a/roles/hp-dl360-g6.rb
+++ b/roles/hp-dl360-g6.rb
@@ -2,6 +2,9 @@ name "hp-dl360-g6"
 description "Role applied to all HP DL360 G6 machines"
 
 default_attributes(
+  :hardware => {
+    :blacklisted_modules => %w[acpi_power_meter]
+  },
   :munin => {
     :plugins => {
       :hpasmcli2_fans => {