From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 14 May 2015 15:17:46 +0000 (+0200)
Subject: remove blavet (RT#5813)
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=ebbb077bbd05947b458da7aea18f05c9497c051f;p=mirror%2Fdsa-puppet.git

remove blavet (RT#5813)
---

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index a4cde27db..6b5aea20a 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -15,7 +15,6 @@ nameinfo:
   bertali.debian.org: Antonio Bertali (March 1605 - 17 April 1669)
   binet.debian.org: Jocelyne Binet (September 27th, 1923 - January 13th, 1968)
   bizet.debian.org: Georges Bizet, (October 25th, 1838 - June 3rd, 1875)
-  blavet.debian.org: Michel Blavet (March 13th, 1700 - October 28th, 1768)
   boiti.debian.org: Arrigo Boito (February 24th, 1842 - June 10th, 1918)
   brahms.debian.org: Johannes Brahms (May 7th, 1833 - April 3rd, 1897)
   busoni.debian.org: Ferruccio Dante Michelangiolo Benvenuto Busoni (April 1st, 1866 - July 27th, 1924)
diff --git a/modules/multipath/templates/multipath-ubc-ganeti.conf.erb b/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
index b117926c2..8edfe7de6 100644
--- a/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
+++ b/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
@@ -117,11 +117,6 @@ multipaths {
                 wwid 3600c0ff000d5f6bd318a9e5101000000
                 alias r10-gombert
         }
-        # blavet
-        multipath {
-                wwid 3600c0ff000d5f6bd736aa05101000000
-                alias r10-blavet
-        }
         # tye
         multipath {
                 wwid 3600c0ff000d5f6bdb08aa05101000000
diff --git a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
index b78e33d94..ce5f1ee8b 100644
--- a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
+++ b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
@@ -17,7 +17,6 @@ when /(asachi|arm-linaro-01|arm-linaro-03).debian.org/ then    ignore << "flash-
 when /harris.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}