X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Ftemplates%2Fobsolete-packages-ignore.d-hostspecific.erb;h=8e0de1efbebfaeabafc014c5c50e9d7097a9f6da;hb=4fd87c46d590f873f1953302a9ac069714fcafc1;hp=963019b5b357b63806065c4f2e8f7dc3e6d5f090;hpb=0e95fbdd080c4c7156bf2c4f938c0b85629a3981;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 963019b5b..8e0de1efb 100644
--- a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
+++ b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
@@ -9,15 +9,9 @@ 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 "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
-
-if scope.call_function('versioncmp', [@lsbmajdistrelease, '8']) <= 0
-  case @fqdn
-    when /(conova-node02|aagaard).debian.org/ then                     ignore << %w{qemu-efi}
-  end
+when /(sallinen|lw07).debian.org/ then                         ignore << %w{ruby-dbi ruby-deprecated ruby-dbd-pg}
+when /(storace|backuphost).debian.org/ then                    ignore << %w{postgresql-client-9.6}
 end
 
 ignore.flatten.join("\n")