From dd9f384b10251fca6b0b819825514295891471ea Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Tue, 27 Jun 2017 12:06:53 +0200 Subject: [PATCH] buildds: disable buildd.d.o repository on stretch hosts Stretch hosts directly use the sbuild and buildd packages from the debian archive. Signed-off-by: Aurelien Jarno --- modules/buildd/manifests/init.pp | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp index f821eac74..a5db82746 100644 --- a/modules/buildd/manifests/init.pp +++ b/modules/buildd/manifests/init.pp @@ -50,12 +50,18 @@ class buildd ($ensure=present) { default => 'jessie' } - site::aptrepo { 'buildd.debian.org': - key => 'puppet:///modules/buildd/buildd.debian.org.gpg', - url => 'https://apt.buildd.debian.org/', - suite => $suite, - components => 'main', - require => Package['apt-transport-https'], + if (versioncmp($::lsbmajdistrelease, '9') >= 0) { + site::aptrepo { 'buildd.debian.org': + ensure => absent, + } + } else { + site::aptrepo { 'buildd.debian.org': + key => 'puppet:///modules/buildd/buildd.debian.org.gpg', + url => 'https://apt.buildd.debian.org/', + suite => $suite, + components => 'main', + require => Package['apt-transport-https'], + } } file { '/etc/apt/apt.conf.d/puppet-https-buildd': -- 2.20.1