Revert "ignore debian.org-recommended on hppa"

[dsa-puppet.git] / modules / nagios / templates / obsolete-packages-ignore.d-hostspecific.erb

diff --git a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
index 3a9425a1aa1ac883c4711d13961c1ef591af8b18..eb110b74e09744251480a7b9496aef275c8c50c4 100644 (file)
--- a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
+++ b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
@@ -20,19 +20,18 @@ when "powell.debian.org":               ignore << %w{e2fslibs e2fsprogs libblkid
 when "rossini.debian.org":              ignore << %w{ganeti2}
 when "franck.debian.org":               ignore << %w{python-apt}
 when "zee.debian.org":                  ignore << %w{dpkg-dev dpkg}
-when "grieg.debian.org":                ignore << %w{dpkg}
 when /(abel|arnold|alain|alwyn|antheil|arne).debian.org/: ignore << %w{flash-kernel linux-firmware-image}
 when /(harris|hoiby).debian.org/:       ignore << %w{flash-kernel puppet puppet-common kernel linux-firmware-image}
 when /(hartmann|hasse|hebden|henze).debian.org/: ignore << %w{flash-kernel puppet puppet-common kernel linux-firmware-image schroot schroot-common}
+
+when "grieg.debian.org":                ignore << %w{dpkg}
+when "blavet.debian.org":               ignore << %w{dpkg-dev libdpkg-perl dpkg}
 end
 
 case fqdn
 when /geo[123].debian.org/: ignore << %w{geoip-database}
 end
 
-if nodeinfo['ldap']['purpose'].include?('buildd')
-       ignore << %w{libsbuild-perl buildd-builder-meta}
-end
 #case fqdn
 #when /(draghi|orff|ravel|klecker|geo[123]).debian.org/: ignore << %w{libdns69 libdns66 libdns64 bind9 libbind9-60 liblwres60 bind9-host libisccfg62 libisccfg60 libisc62 libisc60 dnsutils bind9utils libisccc60}
 #end