From 9adac73b4694331d17e0e44ecad9dfbc48d974bf Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Wed, 2 Mar 2016 23:23:47 +0100 Subject: [PATCH] buildd: squeeze cleanup Signed-off-by: Julien Cristau --- modules/buildd/manifests/init.pp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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, } -- 2.20.1