X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fhardware%2Fmanifests%2Finit.pp;h=5619032ffbe8ec64e82e8f452066188b5af4c1c3;hb=c888c37605afc9df975cb77e237a054af392163a;hp=b505c32c9ef45c36ffcc5a15714e84560ad6eb08;hpb=d1f0cc6e92a382431071c50607dd2d2ea516e155;p=mirror%2Fdsa-puppet.git

diff --git a/modules/hardware/manifests/init.pp b/modules/hardware/manifests/init.pp
index b505c32c9..5619032ff 100644
--- a/modules/hardware/manifests/init.pp
+++ b/modules/hardware/manifests/init.pp
@@ -5,10 +5,10 @@ class hardware {
 		file { '/etc/apt/preferences.d/dsa-hp-tools':
 			content => "Package: hp-health\nPin: version 8.6*\nPin-Priority: 1100\n"
 		}
-	} elsif "$::systemproductname" in ["ProLiant DL380 G5", "ProLiant DL360 G5", "ProLiant DL380 G6", "ProLiant DL360 G6", "ProLiant BL495c G5"] {
-		file { '/etc/apt/preferences.d/dsa-hp-tools':
-			content => "Package: hp-health\nPin: version 10.0.*\nPin-Priority: 1100\n"
-		}
+	#} elsif "$::systemproductname" in ["ProLiant DL380 G5", "ProLiant DL360 G5", "ProLiant DL380 G6", "ProLiant DL360 G6", "ProLiant BL495c G5"] {
+	#	file { '/etc/apt/preferences.d/dsa-hp-tools':
+	#		content => "Package: hp-health\nPin: version 10.0.*\nPin-Priority: 1100\n"
+	#	}
 	} else {
 		file { '/etc/apt/preferences.d/dsa-hp-tools':
 			ensure => absent
@@ -16,4 +16,8 @@ class hardware {
 	}
 
 	include hardware::sensors
+
+	include hardware::fixes
+
+	include hardware::intel
 }