Decommission fano and finzi

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

diff --git a/modules/debian_org/files/misc/local.yaml b/modules/debian_org/files/misc/local.yaml
index 6caf06c..9916aaf 100644 (file)
--- a/modules/debian_org/files/misc/local.yaml
+++ b/modules/debian_org/files/misc/local.yaml
@@ -28,9 +28,7 @@ nameinfo:
   eberlin.debian.org: Johann Ernst Eberlin (March 1702 27th - June 19th, 1762)
   eller.debian.org: Heino Eller (March 7th, 1887 - June 16th, 1970)
   elgar.debian.org: Edward Elgar (1857 - 1934)
-  fano.debian.org: Guido Alberto Fano (March 18th, 1875 - August 14th, 1961)
   fasolo.debian.org: Giovanni Battista Fasolo, O.F.M. (ca. 1598 - after 1664)
-  finzi.debian.org: Gerald Raphael Finzi (July 14th, 1901 - September 27th, 1956)
   gideon.debian.org: Miriam Gideon (October 23rd, 1906 - June 18th, 1996)
   godard.debian.org: Benjamin Louis Paul Godard (August 18th, 1849 - January 10th, 1895)
   gombert.debian.org: Nicolas Gombert (c. 1495 - c. 1560)
@@ -157,8 +155,6 @@ host_settings:
     - arm-conova-04.debian.org
     - arnold.debian.org
     - eberlin.debian.org
-    - fano.debian.org
-    - finzi.debian.org
     - hartmann.debian.org
     - hasse.debian.org
     - henze.debian.org
@@ -215,8 +211,6 @@ host_settings:
   mail_port:
     klecker.debian.org: 2025
     zani.debian.org: 587
-  no_munin:
-    - fano.debian.org
   entropy_key:
     - czerny.debian.org
     - grnet-node01.debian.org

diff --git a/modules/multipath/templates/multipath-ubc-ganeti2.conf.erb b/modules/multipath/templates/multipath-ubc-ganeti2.conf.erb
index 031cfc1..c3b4e93 100644 (file)
--- a/modules/multipath/templates/multipath-ubc-ganeti2.conf.erb
+++ b/modules/multipath/templates/multipath-ubc-ganeti2.conf.erb
@@ -48,24 +48,6 @@ multipaths {
                 wwid 3600c0ff00027786c2ed8de5701000000
                 alias elgar
         }
-        # fano
-        multipath {
-                wwid 3600c0ff00027786c54b7de5701000000
-                alias fano
-        }
-        multipath {
-                wwid 3600c0ff00027786c80b7de5701000000
-                alias fano-srv
-        }
-        # finzi
-        multipath {
-                wwid 3600c0ff00027786cbe4cdd5701000000
-                alias finzi
-        }
-        multipath {
-                wwid 3600c0ff00027786c874edd5701000000
-                alias finzi-srv
-        }
         # geo2
         multipath {
                 wwid 3600c0ff00027786cbf5ee25701000000