From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 20 Mar 2017 15:57:59 +0000 (+0100)
Subject: remove debian.restricted.list apt source on hosts without proliant raid
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=6b3f2197570ae91174b38c04329414c5166c8d05;p=mirror%2Fdsa-puppet.git

remove debian.restricted.list apt source on hosts without proliant raid
---

diff --git a/modules/hardware/manifests/raid.pp b/modules/hardware/manifests/raid.pp
index d682c30b2..1705ea83f 100644
--- a/modules/hardware/manifests/raid.pp
+++ b/modules/hardware/manifests/raid.pp
@@ -1,7 +1,5 @@
 class hardware::raid {
-	if $::smartarraycontroller {
-		include hardware::raid::proliant
-	}
+	include hardware::raid::proliant
 
 	if $::productname == 'PowerEdge 2850' {
 		include hardware::raid::megactl
diff --git a/modules/hardware/manifests/raid/proliant.pp b/modules/hardware/manifests/raid/proliant.pp
index fe6cbc9f4..a19ec2849 100644
--- a/modules/hardware/manifests/raid/proliant.pp
+++ b/modules/hardware/manifests/raid/proliant.pp
@@ -1,29 +1,34 @@
 class hardware::raid::proliant {
+	if $::smartarraycontroller {
+		site::aptrepo { 'debian.restricted':
+			url        => 'http://db.debian.org/debian-admin',
+			suite      => "${::lsbdistcodename}-restricted",
+			components => 'non-free',
+		}
 
-	site::aptrepo { 'debian.restricted':
-		url        => 'http://db.debian.org/debian-admin',
-		suite      => "${::lsbdistcodename}-restricted",
-		components => 'non-free',
-	}
-
-	package { 'hpacucli':
-		ensure  => installed,
-		tag    => extra_repo,
-	}
-	package { 'hpssacli':
-		ensure  => installed,
-		tag    => extra_repo,
-	}
-	if !("$::systemproductname" in ["ProLiant DL180 G5", "ProLiant DL120 G5", "ProLiant ML150 G5"]) {
-		package { 'hp-health':
-			ensure => installed,
+		package { 'hpacucli':
+			ensure  => installed,
 			tag    => extra_repo,
 		}
-	}
+		package { 'hpssacli':
+			ensure  => installed,
+			tag    => extra_repo,
+		}
+		if !("$::systemproductname" in ["ProLiant DL180 G5", "ProLiant DL120 G5", "ProLiant ML150 G5"]) {
+			package { 'hp-health':
+				ensure => installed,
+				tag    => extra_repo,
+			}
+		}
 
-	if $::debarchitecture == 'amd64' {
-		package { 'lib32gcc1':
-			ensure => installed,
+		if $::debarchitecture == 'amd64' {
+			package { 'lib32gcc1':
+				ensure => installed,
+			}
+		}
+	} else {
+		site::aptrepo { 'debian.restricted':
+			ensure => absent,
 		}
 	}
 }