X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Flinux%2Fmanifests%2Finit.pp;h=d5a7a3e24942a3732a19af4bda8c39ed352e0e6a;hb=refs%2Fheads%2Fsalsa;hp=78ab1da775f5fda106801dc27cfcf8ed8abfa89f;hpb=71a8d524f79fa0eda9a90b535b5008691daeeb60;p=mirror%2Fdsa-puppet.git

diff --git a/modules/linux/manifests/init.pp b/modules/linux/manifests/init.pp
index 78ab1da77..d5a7a3e24 100644
--- a/modules/linux/manifests/init.pp
+++ b/modules/linux/manifests/init.pp
@@ -1,6 +1,15 @@
+# common bits for all linux hosts
 class linux {
-	include ferm
-	include ferm::per-host
-	include entropykey
-	include rng-tools
+  include ferm
+  include ferm::per_host
+  include entropykey
+  include rng_tools
+  if $::hostname in [fasolo, storace, sallinen, csail-node01, csail-node02] {
+    $blacklist_acpi_power_meter = true
+  }
+  if $blacklist_acpi_power_meter {
+    file { '/etc/modprobe.d/hwmon.conf':
+      content => 'blacklist acpi_power_meter'
+    }
+  }
 }