From: Julien Cristau <jcristau@debian.org>
Date: Wed, 7 Nov 2018 21:07:37 +0000 (+0100)
Subject: Install srvadmin foo on dell hosts, and move our restricted archive to debian_org... 
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=2556124d53a7f3cf725a53b9dab821036e144b6b;p=mirror%2Fdsa-puppet.git

Install srvadmin foo on dell hosts, and move our restricted archive to debian_org::apt_restricted
---

diff --git a/modules/debian_org/manifests/apt_restricted.pp b/modules/debian_org/manifests/apt_restricted.pp
new file mode 100644
index 000000000..86d856130
--- /dev/null
+++ b/modules/debian_org/manifests/apt_restricted.pp
@@ -0,0 +1,7 @@
+class debian_org::apt_restricted {
+	site::aptrepo { 'db.debian.org.restricted':
+		url        => 'http://db.debian.org/debian-admin',
+		suite      => '${::lsbdistcodename}-restricted',
+		components => 'non-free',
+	}
+}
diff --git a/modules/hardware/manifests/raid.pp b/modules/hardware/manifests/raid.pp
index 1dac055b6..497971ec2 100644
--- a/modules/hardware/manifests/raid.pp
+++ b/modules/hardware/manifests/raid.pp
@@ -1,9 +1,7 @@
 class hardware::raid {
 	include hardware::raid::proliant
 
-	if $::productname == 'PowerEdge 1950' {
-		include hardware::raid::dell
-	}
+	include hardware::raid::dell
 
 	include hardware::raid::raidmpt
 	include hardware::raid::megaraid_sas
diff --git a/modules/hardware/manifests/raid/dell.pp b/modules/hardware/manifests/raid/dell.pp
index a69997a47..8e56c6130 100644
--- a/modules/hardware/manifests/raid/dell.pp
+++ b/modules/hardware/manifests/raid/dell.pp
@@ -1,20 +1,29 @@
 class hardware::raid::dell {
+	if "$::manufacturer" == "Dell Inc." {
+		include debian_org::apt_restricted
+
+		package { 'srvadmin-server-cli':
+			ensure  => installed,
+			tag    => extra_repo,
+		}
+		package { 'srvadmin-storage-cli':
+			ensure  => installed,
+			tag    => extra_repo,
+		}
+		package { 'srvadmin-omcommon':
+			ensure  => installed,
+			tag    => extra_repo,
+		}
+		package { 'libssl1.0.0':
+			ensure  => installed,
+			tag    => extra_repo,
+		}
+
+	}
 	site::aptrepo { 'jessie.dell':
-		url        => 'http://deb.debian.org/debian',
-		suite      => 'jessie',
-		components => 'main',
+		ensure => absent,
 	}
 	site::aptrepo { 'debian.restricted.dell':
-		url        => 'http://db.debian.org/debian-admin',
-		suite      => 'jessie-restricted',
-		components => 'non-free',
-	}
-
-	package { 'libssl1.0.0':
-		ensure	=> installed,
-	}
-	package { 'srvadmin-storage-cli':
-		ensure  => installed,
-		tag    => extra_repo,
+		ensure => absent,
 	}
 }
diff --git a/modules/hardware/manifests/raid/megaraid_sas.pp b/modules/hardware/manifests/raid/megaraid_sas.pp
index bac45119f..e4bfee20b 100644
--- a/modules/hardware/manifests/raid/megaraid_sas.pp
+++ b/modules/hardware/manifests/raid/megaraid_sas.pp
@@ -1,10 +1,6 @@
 class hardware::raid::megaraid_sas {
 	if $::megaraid_sas {
-		site::aptrepo { 'debian.restricted.megaraid_sas':
-			url        => 'http://db.debian.org/debian-admin',
-			suite      => 'stretch-restricted',
-			components => 'non-free',
-		}
+		include debian_org::apt_restricted
 
 		package { 'megacli':
 			ensure  => installed,
@@ -15,9 +11,6 @@ class hardware::raid::megaraid_sas {
 			target => '/opt/MegaRAID/MegaCli/MegaCli64',
 		}
 	} else {
-		site::aptrepo { 'debian.restricted.megaraid_sas':
-			ensure => absent,
-		}
 		package { 'megacli':
 			ensure  => purged,
 		}
@@ -25,4 +18,7 @@ class hardware::raid::megaraid_sas {
 			ensure => 'absent',
 		}
 	}
+	site::aptrepo { 'debian.restricted.megaraid_sas':
+		ensure => absent,
+	}
 }
diff --git a/modules/hardware/manifests/raid/proliant.pp b/modules/hardware/manifests/raid/proliant.pp
index 036008724..afc709138 100644
--- a/modules/hardware/manifests/raid/proliant.pp
+++ b/modules/hardware/manifests/raid/proliant.pp
@@ -1,10 +1,9 @@
 class hardware::raid::proliant {
 	if $::smartarraycontroller_hpsa or $::smartarraycontroller_cciss {
 		site::aptrepo { 'debian.restricted':
-			url        => 'http://db.debian.org/debian-admin',
-			suite      => "${::lsbdistcodename}-restricted",
-			components => 'non-free',
+			ensure => absent,
 		}
+		include debian_org::apt_restricted
 
 		package { 'hpacucli':
 			ensure  => installed,