From 33ef9d8cf9b3c33aa8b0abc678a2b94d4aaefb55 Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Mon, 1 Apr 2019 11:10:27 +0200 Subject: [PATCH] More mirror-conova decomissioning --- modules/linux/manifests/init.pp | 2 +- modules/roles/manifests/bgp.pp | 1 - modules/roles/manifests/historical_mirror.pp | 1 - modules/roles/manifests/security_mirror.pp | 1 - modules/roles/manifests/syncproxy.pp | 2 -- 5 files changed, 1 insertion(+), 6 deletions(-) diff --git a/modules/linux/manifests/init.pp b/modules/linux/manifests/init.pp index 97cc6431b..6b35ff111 100644 --- a/modules/linux/manifests/init.pp +++ b/modules/linux/manifests/init.pp @@ -3,7 +3,7 @@ class linux { include ferm::per_host include entropykey include rng_tools - if $::hostname in [fasolo, klecker, mirror-conova, storace, sallinen] { + if $::hostname in [fasolo, klecker, storace, sallinen] { $blacklist_acpi_power_meter = true } if $blacklist_acpi_power_meter { diff --git a/modules/roles/manifests/bgp.pp b/modules/roles/manifests/bgp.pp index fa0fec2cf..da7fcb5f3 100644 --- a/modules/roles/manifests/bgp.pp +++ b/modules/roles/manifests/bgp.pp @@ -1,6 +1,5 @@ class roles::bgp { $bgp_peers = $::hostname ? { - 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', default => undef, diff --git a/modules/roles/manifests/historical_mirror.pp b/modules/roles/manifests/historical_mirror.pp index b6ae8668a..3ba353930 100644 --- a/modules/roles/manifests/historical_mirror.pp +++ b/modules/roles/manifests/historical_mirror.pp @@ -9,7 +9,6 @@ class roles::historical_mirror { gretchaninov => ['209.87.16.41' , '[2607:f8f0:614:1::1274:41]' ], klecker => ['130.89.148.13' , '[2001:67c:2564:a119::148:13]' ], schmelzer => ['217.196.149.234', '[2a02:16a8:dc41:100::234]' ], - mirror-conova => ['217.196.149.234', '[2a02:16a8:dc41:100::234]' ], sibelius => ['193.62.202.28' , '[2001:630:206:4000:1a1a:0:c13e:ca1c]'], default => ['[::]'], } diff --git a/modules/roles/manifests/security_mirror.pp b/modules/roles/manifests/security_mirror.pp index c8478bbf7..20de54785 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-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]' ], schmelzer => [ '217.196.149.233', '[2a02:16a8:dc41:100::233]' ], diff --git a/modules/roles/manifests/syncproxy.pp b/modules/roles/manifests/syncproxy.pp index 0decff42d..efc71c1dd 100644 --- a/modules/roles/manifests/syncproxy.pp +++ b/modules/roles/manifests/syncproxy.pp @@ -6,7 +6,6 @@ class roles::syncproxy { $binds = $::hostname ? { 'milanollo' => [ '5.153.231.9', '[2001:41c8:1000:21::21:9]' ], 'mirror-anu' => [ '150.203.164.60', '[2001:388:1034:2900::3c]' ], - 'mirror-conova' => [ '217.196.149.237', '[2a02:16a8:dc41:100::237]' ], 'mirror-isc' => [ '149.20.4.16', '[2001:4f8:1:c::16]' ], 'mirror-umn' => [ '128.101.240.216', '[2607:ea00:101:3c0b::1deb:216]' ], 'klecker' => [ '130.89.148.10', '[2001:67c:2564:a119::148:10]' ], @@ -17,7 +16,6 @@ class roles::syncproxy { $syncproxy_name = $::hostname ? { 'milanollo' => 'syncproxy3.eu.debian.org', 'mirror-anu' => 'syncproxy.au.debian.org', - 'mirror-conova' => 'syncproxy4.eu.debian.org', 'schmelzer' => 'syncproxy4.eu.debian.org', 'mirror-isc' => 'syncproxy2.wna.debian.org', 'mirror-umn' => 'syncproxy.cna.debian.org', -- 2.20.1