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

diff --git a/modules/hardware/manifests/init.pp b/modules/hardware/manifests/init.pp
index 271b8f81d..5619032ff 100644
--- a/modules/hardware/manifests/init.pp
+++ b/modules/hardware/manifests/init.pp
@@ -1,10 +1,14 @@
 class hardware {
 	include hardware::raid
 
-	if "$::systemproductname" in ["ProLiant BL495c G5", "ProLiant DL385 G1", "ProLiant DL380 G4", "ProLiant DL360 G4"] {
+	if "$::systemproductname" in ["ProLiant DL385 G1", "ProLiant DL380 G4", "ProLiant DL360 G4"] {
 		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"
+	#	}
 	} else {
 		file { '/etc/apt/preferences.d/dsa-hp-tools':
 			ensure => absent
@@ -12,4 +16,8 @@ class hardware {
 	}
 
 	include hardware::sensors
+
+	include hardware::fixes
+
+	include hardware::intel
 }