From: Julien Cristau <jcristau@debian.org>
Date: Tue, 10 Sep 2019 12:15:18 +0000 (+0200)
Subject: debian_org::apt: remove jessie support
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=1d33caf2918eb0ae8c2aee0db8620a77da9c5818

debian_org::apt: remove jessie support
---

diff --git a/modules/debian_org/manifests/apt.pp b/modules/debian_org/manifests/apt.pp
index eaed3f133..ea61ba09e 100644
--- a/modules/debian_org/manifests/apt.pp
+++ b/modules/debian_org/manifests/apt.pp
@@ -5,20 +5,10 @@
 class debian_org::apt {
 	$mirror = lookup('apt::sources::debian::location')
 
-	# jessie
-	if versioncmp($::lsbmajdistrelease, '8') <= 0 {
-		base::aptrepo { 'debian':
-			url        => $mirror,
-			suite      => [ $::lsbdistcodename ],
-			components => ['main','contrib','non-free']
-		}
-	# stretch or buster
-	} else {
-		base::aptrepo { 'debian':
-			url        => $mirror,
-			suite      => [ $::lsbdistcodename, "${::lsbdistcodename}-backports", "${::lsbdistcodename}-updates" ],
-			components => ['main','contrib','non-free']
-		}
+	base::aptrepo { 'debian':
+		url        => $mirror,
+		suite      => [ $::lsbdistcodename, "${::lsbdistcodename}-backports", "${::lsbdistcodename}-updates" ],
+		components => ['main','contrib','non-free']
 	}
 
 	base::aptrepo { 'security':