From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 2 Aug 2017 16:44:49 +0000 (+0200)
Subject: At least on lobos we no longer seem to require running a 10.0.* hp-health package... 
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=615bce2ae68a47a95e0f5c741f08a2da4ae395b2;p=mirror%2Fdsa-puppet.git

At least on lobos we no longer seem to require running a 10.0.* hp-health package.  Remove the pin everywhere and see how that goes
---

diff --git a/modules/hardware/manifests/init.pp b/modules/hardware/manifests/init.pp
index b505c32c9..eb453183c 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