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

diff --git a/modules/hardware/manifests/init.pp b/modules/hardware/manifests/init.pp
index 921eef827..5619032ff 100644
--- a/modules/hardware/manifests/init.pp
+++ b/modules/hardware/manifests/init.pp
@@ -1,9 +1,23 @@
 class hardware {
 	include hardware::raid
 
-	if "$::systemproductname" in ["ProLiant BL495c G5", "ProLiant DL385 G1", "ProLiant DL380 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
+		}
 	}
+
+	include hardware::sensors
+
+	include hardware::fixes
+
+	include hardware::intel
 }