From: Peter Palfrader Date: Thu, 23 Feb 2017 18:31:43 +0000 (+0100) Subject: rename bilbao to mirror-bytemark X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=a3f27248848dc5726cdd2708aeb885953e6369f6;p=mirror%2Fdsa-puppet.git rename bilbao to mirror-bytemark --- diff --git a/hieradata/common.yaml b/hieradata/common.yaml index 2e77378af..491792773 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -216,13 +216,13 @@ roles: - vittoria.debian.org debian_mirror: - klecker.debian.org - - bilbao.debian.org + - mirror-bytemark.debian.org - boman.debian.org - mirror-conova.debian.org - mirror-isc.debian.org debian_mirror_onion: - klecker.debian.org - - bilbao.debian.org + - mirror-bytemark.debian.org - mirror-isc.debian.org historical_master: - sibelius.debian.org @@ -284,7 +284,7 @@ roles: - villa.debian.org - wieck.debian.org bgp: - - bilbao.debian.org + - mirror-bytemark.debian.org - mirror-conova.debian.org cdimage-search: - cgi-grnet-01.debian.org diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml index 593ddd855..cbfc3e804 100644 --- a/modules/debian-org/misc/local.yaml +++ b/modules/debian-org/misc/local.yaml @@ -11,7 +11,6 @@ nameinfo: beach.debian.org: Amy Marcy Cheney Beach (September 5th, 1867 - December 27th, 1944) beethoven.debian.org: Ludwig van Beethoven (December 16th, 1770 - March 26th, 1827) bendel.debian.org: Franz Bendel (March 23rd, 1833 - July 3rd, 1874) - bilbao.debian.org: Beatriz Bilbao (b. December 8th 1951) binet.debian.org: Jocelyne Binet (September 27th, 1923 - January 13th, 1968) boman.debian.org: Per Conrad Boman (June 6th, 1804 - March 17th, 1861) boott.debian.org: Francis Boott (June 24th, 1813 - March 1st, 1904) diff --git a/modules/multipath/templates/multipath-bm.conf.erb b/modules/multipath/templates/multipath-bm.conf.erb index ffa6ae33b..ae7551f49 100644 --- a/modules/multipath/templates/multipath-bm.conf.erb +++ b/modules/multipath/templates/multipath-bm.conf.erb @@ -34,11 +34,11 @@ multipaths { } multipath { wwid 3600c0ff000d75b589aaa8b5801000000 - alias bilbao + alias mirror-bytemark } multipath { wwid 3600c0ff000d5ad34203b935801000000 - alias bilbao-lvm + alias mirror-bytemark-lvm } multipath { wwid 3600c0ff000d5ad34f559665401000000 diff --git a/modules/roles/manifests/bgp.pp b/modules/roles/manifests/bgp.pp index 61409d9c0..6cff92e3f 100644 --- a/modules/roles/manifests/bgp.pp +++ b/modules/roles/manifests/bgp.pp @@ -1,6 +1,6 @@ class roles::bgp { $bgp_peers = $::hostname ? { - bilbao => '2001:41c9:2:13c::2/128 89.16.162.2/32', + 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', default => undef, } diff --git a/modules/roles/manifests/debian_mirror.pp b/modules/roles/manifests/debian_mirror.pp index 0da036ec0..d49489e84 100644 --- a/modules/roles/manifests/debian_mirror.pp +++ b/modules/roles/manifests/debian_mirror.pp @@ -8,7 +8,7 @@ class roles::debian_mirror { default => '*:80', } $onion_v4_addr = $::hostname ? { - bilbao => '5.153.231.37', + mirror-bytemark => '5.153.231.37', klecker => '130.89.148.12', mirror-isc => '149.20.4.15', default => undef,