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=ded933abb3cb77fa843fcadb767f6f3959f2ae83;hp=5a4403b7bad9f3409d0a5b0f7ed35d205b8ac70a;hpb=74ed2c40f0f4ca856c7d9e01271a0edd74c77f2a;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 5a4403b7b..2c9429e04 100644
--- a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
+++ b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
@@ -5,13 +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}
+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-api64 gskssl64 gskcrypt64 tivsm-api gskssl gskcrypt}
-when "storace.debian.org" then                                 ignore << %w{postgresql-client-9.1}
+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|conova-node01).debian.org/ then                     ignore << %w{qemu-efi}
+  end
 end
 
 ignore.flatten.join("\n")