X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Ftemplates%2Fobsolete-packages-ignore.d-hostspecific.erb;h=912d39f2dcd1e568df31e1d423e4ead2d6e1a299;hb=e8862bd29c97afcdf772f9c689948e958ae71295;hp=16367ab23ec2fc506ccb2670eb1bf429c2a0fe46;hpb=5ef00ef2cd4e25f7d15619be15f43e1910d3095f;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 16367ab23..912d39f2d 100644
--- a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
+++ b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
@@ -12,20 +12,19 @@ when /zappa.debian.org/ then                                   ignore << %w{samh
 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|antheil).debian.org/ then  ignore << %w{flash-kernel linux-firmware-image}
+when /(abel|arnold|antheil).debian.org/ then                   ignore << %w{flash-kernel linux-firmware-image}
+when /(asachi|arm-linaro-01|arm-linaro-03).debian.org/ then    ignore << "flash-kernel"
 when /harris.debian.org/ then                                  ignore << %w{flash-kernel kernel linux-firmware-image}
-when /(hartmann|hasse|henze|howells|hummel|hoiby).debian.org/ then ignore << %w{flash-kernel kernel linux-firmware-image}
+when /(hartmann|hasse|henze|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}
 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 "sibelius.debian.org" then                                ignore << %w{tivsm-ba tivsm-api64 gskssl64 gskcrypt64 tivsm-api gskssl gskcrypt}
 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 /csail-node(01|02).debian.org/ then                       ignore << %w{openvswitch-switch openvswitch-common}
+when /(csail|grnet)-node(01|02).debian.org/ then               ignore << %w{openvswitch-switch openvswitch-common}
 end
 
 case fqdn
@@ -33,7 +32,7 @@ when /geo[123].debian.org/ then                    ignore << %w{geoip-database}
 end
 
 case fqdn
-when /(csail-node(01|02)|powell|bm-bl1).debian.org/ then       ignore << %w{ganeti-os-noop}
+when /((csail|grnet)-node(01|02)|powell|bm-bl1).debian.org/ then       ignore << %w{ganeti-os-noop}
 end
 
 ignore.flatten.join("\n")