From: Aurelien Jarno <aurelien@aurel32.net>
Date: Mon, 19 Feb 2018 18:56:52 +0000 (+0100)
Subject: Decommission mirror-bytemark
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=98e8335486b2e3f46f4e5412a4c015c3d163bf6a;p=mirror%2Fdsa-puppet.git

Decommission mirror-bytemark

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

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 26f110c7a..1d5988705 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -118,8 +118,6 @@ roles:
   security_mirror:
     mirror-anu.debian.org:
       fastly-backend: false
-    mirror-bytemark.debian.org:
-      fastly-backend: false
     mirror-conova.debian.org:
       fastly-backend: false
     mirror-csail.debian.org:
@@ -260,13 +258,6 @@ roles:
         - '[2001:610:1908:b000::148:12]:80'
         - '[2001:67c:2564:a119::148:12]:80'
       onion_v4_address: 130.89.148.12
-    mirror-bytemark.debian.org:
-      service-hostname: bytemark.debian.backend.mirrors.debian.org
-      listen-addresses:
-        - '5.153.231.45:80'
-        - '[2001:41c8:1000:21::21:45]:80'
-      fastly-backend: false
-      onion_v4_address: 5.153.231.45
     mirror-accumu.debian.org:
       service-hostname: accumu.debian.backend.mirrors.debian.org
       fastly-backend: true
@@ -321,7 +312,6 @@ roles:
   onionbalance:
     - olin.debian.org
   bgp:
-    - mirror-bytemark.debian.org
     - mirror-conova.debian.org
     - mirror-accumu.debian.org
     - mirror-skroutz.debian.org
diff --git a/modules/multipath/templates/multipath-bm.conf.erb b/modules/multipath/templates/multipath-bm.conf.erb
index 6ce4c40a8..84189ce15 100644
--- a/modules/multipath/templates/multipath-bm.conf.erb
+++ b/modules/multipath/templates/multipath-bm.conf.erb
@@ -32,14 +32,6 @@ multipaths {
 		wwid	3600c0ff000d5ad34e88c635401000000
 		alias	barriere-lvm
 	}
-	multipath {
-		wwid	3600c0ff000d75b589aaa8b5801000000
-		alias	mirror-bytemark
-	}
-	multipath {
-		wwid	3600c0ff000d5ad34203b935801000000
-		alias	mirror-bytemark-lvm
-	}
 	multipath {
 		wwid	3600c0ff000d5ad34f559665401000000
 		alias	binet
diff --git a/modules/roles/manifests/bgp.pp b/modules/roles/manifests/bgp.pp
index 43ceef581..fa0fec2cf 100644
--- a/modules/roles/manifests/bgp.pp
+++ b/modules/roles/manifests/bgp.pp
@@ -1,6 +1,5 @@
 class roles::bgp {
 	$bgp_peers = $::hostname ? {
-		mirror-bytemark => '2001:41c9:2:13c::2/128 89.16.162.2/32',
 		mirror-conova => '2a02:16a8:5404:199::25/128 217.196.157.53/32',
 		mirror-accumu => '2001:6b0:1e:2::1c6/128 130.242.6.198/32',
 		mirror-skroutz => '2a03:e40:42:200::151:1/128 2a03:e40:42:200::151:2/128 154.57.0.249/32 154.57.0.250',
diff --git a/modules/roles/manifests/security_mirror.pp b/modules/roles/manifests/security_mirror.pp
index 33cdd1c4f..c6a5766d2 100644
--- a/modules/roles/manifests/security_mirror.pp
+++ b/modules/roles/manifests/security_mirror.pp
@@ -3,7 +3,6 @@ class roles::security_mirror {
 
 	$binds = $::hostname ? {
 		mirror-anu      => [ '150.203.164.61', '[2001:388:1034:2900::3d]' ],
-		mirror-bytemark => [ '5.153.231.46', '[2001:41c8:1000:21::21:46]' ],
 		mirror-conova   => [ '217.196.149.233', '[2a02:16a8:dc41:100::233]' ],
 		mirror-isc      => [ '149.20.4.14', '[2001:4f8:1:c::14]' ],
 		mirror-umn      => [ '128.101.240.215', '[2607:ea00:101:3c0b::1deb:215]' ],