From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 28 May 2013 19:30:28 +0000 (+0200)
Subject: remove apt/perferences.d/buildd on all hosts
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=dceca389ae68f061652fc303e066bdb3e9d23aa6;hp=0b2a09d5a5ad6f685e1d091b497e9a349c25f3d4;p=mirror%2Fdsa-puppet.git

remove apt/perferences.d/buildd on all hosts
---

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index e0a5ad838..2dff5ec56 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -73,8 +73,7 @@ class buildd ($ensure=present) {
 		ensure => absent,
 	}
 	file { '/etc/apt/preferences.d/buildd':
-		content => template('buildd/etc/apt/preferences.d/buildd'),
-		before  => Site::Aptrepo['buildd.debian.org']
+		ensure => absent,
 	}
 	file { '/etc/cron.d/dsa-buildd':
 		source  => 'puppet:///modules/buildd/cron.d-dsa-buildd',
diff --git a/modules/buildd/templates/etc/apt/preferences.d/buildd b/modules/buildd/templates/etc/apt/preferences.d/buildd
deleted file mode 100644
index 4be1d8ea8..000000000
--- a/modules/buildd/templates/etc/apt/preferences.d/buildd
+++ /dev/null
@@ -1,17 +0,0 @@
-<% if scope.lookupvar('site::nodeinfo')['ldap'].has_key?('architecture') and scope.lookupvar('site::nodeinfo')['ldap']['architecture'][0] == 'armhf' -%>
-Package: schroot
-Pin: release o=buildd.debian.org
-Pin-Priority: 700
-
-Package: schroot-common
-Pin: release o=buildd.debian.org
-Pin-Priority: 700
-<% else -%>
-Package: schroot
-Pin: release o=buildd.debian.org
-Pin-Priority: 500
-
-Package: schroot-common
-Pin: release o=buildd.debian.org
-Pin-Priority: 500
-<% end %>