From: Julien Cristau <jcristau@debian.org>
Date: Wed, 2 Mar 2016 22:23:47 +0000 (+0100)
Subject: buildd: squeeze cleanup
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=9adac73b4694331d17e0e44ecad9dfbc48d974bf;p=mirror%2Fdsa-puppet.git

buildd: squeeze cleanup

Signed-off-by: Julien Cristau <jcristau@debian.org>
---

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 7b22eae1e..2809094c4 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -39,12 +39,11 @@ class buildd ($ensure=present) {
 	}
 
 	$suite = $::lsbdistcodename ? {
-		squeeze  => $::lsbdistcodename,
 		wheezy   => $::lsbdistcodename,
 		jessie   => $::lsbdistcodename,
 		stretch  => $::lsbdistcodename,
-		undef   => 'squeeze',
-		default => 'wheezy'
+		undef   => 'wheezy',
+		default => 'jessie'
 	}
 
 	$buildd_apt_url = $::debarchitecture ? {
@@ -95,7 +94,7 @@ class buildd ($ensure=present) {
 		require => Package['debian.org']
 	}
 
-	if ($::lsbmajdistrelease >= 7 and $::kernel == 'Linux') {
+	if ($::kernel == 'Linux') {
 		package { 'python-psutil':
 			ensure => installed,
 		}