decommission bizet

Signed-off-by: Julien Cristau <jcristau@debian.org>

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 0e85c99..4038a5b 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -113,7 +113,6 @@ roles:
     - nono.debian.org
     - ticharich.debian.org
   static_master:
-    - bizet.debian.org
     - dillon.debian.org
     - franck.debian.org
   static_mirror:

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 1c0faac..1b70c82 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -12,7 +12,6 @@ nameinfo:
   bendel.debian.org: Franz Bendel (March 23rd, 1833 - July 3rd, 1874)
   berlioz.debian.org: Hector Berlioz (December 11th, 1803 - March 8th, 1869)
   binet.debian.org: Jocelyne Binet (September 27th, 1923 - January 13th, 1968)
-  bizet.debian.org: Georges Bizet, (October 25th, 1838 - June 3rd, 1875)
   busoni.debian.org: Ferruccio Dante Michelangiolo Benvenuto Busoni (April 1st, 1866 - July 27th, 1924)
   buxtehude.debian.org: Dieterich Buxtehude (c. 1637 to 1639 - May 9th, 1707)
   byrd.debian.org: William Byrd (1543 - July 4th, 1623)
@@ -177,7 +176,6 @@ host_settings:
     # decommissioning
     - rautavaara.debian.org
     # mirrors, secondaries, syncproxies
-    - bizet.debian.org
     - busoni.debian.org
     - gluck.debian.org
     - pkgmirror-1and1.debian.org

diff --git a/modules/multipath/templates/multipath-ubc-ganeti.conf.erb b/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
index a17f573..ed4a609 100644 (file)
--- a/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
+++ b/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
@@ -122,13 +122,4 @@ multipaths {
                 wwid 3600c0ff000d5f6bd6c75695501000000
                 alias r10-nono-lvm
         }
-        # bizet
-        multipath {
-                wwid 3600c0ff000d5f6bdba31435501000000
-                alias r10-bizet
-        }
-        multipath {
-                wwid 3600c0ff000d5f6bdc5d83f4f01000000
-                alias bizet-srv
-        }
 }