X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Ftemplates%2Fobsolete-packages-ignore.d-hostspecific.erb;h=2c9429e04d9fd22baeacc58eb9058420eb8a3ad2;hb=177350d84918f8cd64fa304ee9b5c55a1952a17d;hp=a9906f87e52144d66ec19b0f6e855f13e95a2e9d;hpb=010f7916e255994e9e7311517da0a47a8f5de00a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
index a9906f87e..2c9429e04 100644
--- a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
+++ b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
@@ -5,36 +5,19 @@
 
 <%=
 ignore = []
-case fqdn
-when /draghi.debian.org/ then                                  ignore << %w{userdir-ldap userdir-ldap-cgi libheimdal-kadm5-perl django-ldapdb ud python-cdb python-nameparser}
-when /orff.debian.org/ then                                    ignore << %w{libnet-dns-sec-perl libnet-dns-zone-parser-perl}
-when /(zandonai|zelenka).debian.org/ then                      ignore << %w{samhain zabbix-agent rrdcollect}
-when /zappa.debian.org/ then                                   ignore << %w{samhain}
-when /(mayer|corelli).debian.org/ then                         ignore << "linux-base"
-when /(alkman|caballero|merulo|mundy|zani).debian.org/ then    ignore << "samhain"
-when "franck.debian.org" then                                  ignore << %w{python-apt}
-when /(abel|arnold|alwyn|antheil|arne).debian.org/ then  ignore << %w{flash-kernel linux-firmware-image}
-when /harris.debian.org/ then                                  ignore << %w{flash-kernel kernel linux-firmware-image}
-when /(hasse|henze|howells|hummel|hoiby).debian.org/ then ignore << %w{flash-kernel kernel linux-firmware-image}
-when /(parry|partch).debian.org/ then                          ignore << "yaboot"
-when "blavet.debian.org" then                                  ignore << %w{dpkg-dev libdpkg-perl dpkg}
+case @fqdn
+when /draghi.debian.org/ then                                  ignore << %w{userdir-ldap userdir-ldap-cgi libheimdal-kadm5-perl django-ldapdb ud python-cdb python-nameparser python-django-ldapdb}
 when "handel.debian.org" then                                  ignore << %w{puppet-dashboard}
 when "reger.debian.org" then                                   ignore << %w{librt-extension-commandbymail-perl}
 when /(rainier|rapoport).debian.org/ then                      ignore << %w{rabbitmq-server}
-when /(pasquini|tristano).debian.org/ then                     ignore << %w{ganeti-instance-image}
-when "zemlinsky.debian.org" then                               ignore << %w{initramfs-tools}
-when "sibelius.debian.org" then                                ignore << %w{tivsm-ba tivsm-api64 gskssl64 gskcrypt64}
-when "denis.debian.org" then                                   ignore << %w{libdns100 libbind9-90 libisccc90 bind9 liblwres90 libisc95 bind9utils libisccfg90}
-when "vogler.debian.org" then                                  ignore << %w{repro libresiprocate-1.9 resiprocate-turn-server}
-when /(mailly|muffat).debian.org/ then                         ignore << %w{python-dsa-mq}
+when "sibelius.debian.org" then                                ignore << %w{tivsm-ba tivsm-bacit tivsm-api64 gskssl64 gskcrypt64 tivsm-api tivsm-apicit gskssl gskcrypt}
+when /(storace|backuphost).debian.org/ then                    ignore << %w{postgresql-client-9.1 libssl1.0.0:amd64 postgresql-client-9.4}
 end
 
-case fqdn
-when /geo[123].debian.org/ then                    ignore << %w{geoip-database}
-end
-
-if fqdn == "arne.debian.org"
-    ignore << %w{/linux-headers-.*/}
+if scope.call_function('versioncmp', [@lsbmajdistrelease, '8']) <= 0
+  case @fqdn
+    when /(conova-node02|conova-node01).debian.org/ then                     ignore << %w{qemu-efi}
+  end
 end
 
 ignore.flatten.join("\n")