tidy us-nyc1 and move services
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
Simon Marsh 2022-07-28 10:47:04 +01:00
parent 64563b8fff
commit b9301de0f2
Signed by: burble
GPG Key ID: 0FCCD13AE1CF7ED8
2 changed files with 6 additions and 11 deletions

View File

@ -25,7 +25,6 @@ service('pingable', 'fd42:4242:2601:ac05::1', '172.20.129.5');
service('rproxy', 'fd42:4242:2601:acf0::1', '172.20.129.7');
service('whois', 'fd42:4242:2601:ac43::1', '172.20.129.8');
// services 172.20.129.9 -> 172.20.129.29 are unassigned
service('shell.us-nyc1', 'fd42:4242:2601:1005:216:3eff:fe77:4dfe');
service('shell.us-lax1', 'fd42:4242:2601:100a:216:3eff:fe5c:30b2', '172.20.129.27');
service('shell.fr-par1', 'fd42:4242:2601:1017:216:3eff:fe01:2f1f', '172.20.129.28');
service('shell.fr-nte2', 'fd42:4242:2601:1004:fc13:b592:53b0:8ff4', '172.20.129.29');
@ -94,9 +93,9 @@ D_EXTEND(
// evpn subdomain
NS('evpn', 'ns.uk-lon1.evpn.burble.dn42.'),
NS('evpn', 'ns.us-nyc1.evpn.burble.dn42.'),
NS('evpn', 'ns.ca-bhs2.evpn.burble.dn42.'),
AAAA('ns.uk-lon1.evpn', 'fd42:4242:2601:335:72e8:bff:fe58:b51b'),
AAAA('ns.uk-nyc1.evpn', 'fd42:4242:2601:325:72e8:bff:fe58:b51b'),
AAAA('ns.ca-bhs2.evpn', 'fd42:4242:2601:32d:72e8:bff:fe58:b51b'),
// DS('evpn', 46501,13,2,'ba25a8ee27c9fcc9595b60aab43aad60fd30fad073861159e157e7edf7239fc0'),
// global service aliases
@ -121,8 +120,6 @@ D_EXTEND(
SSHFP('shell.fr-rbx1', 4, 2, 'fb2ddf25f4a228e147134b2a02187d4710aa78929cdbe2a119a183e91a758a81'),
SSHFP('shell.ca-bhs2', 4, 1, '3e08e7e4f261211d23ea92a4dd4fa210c1cedfd9'),
SSHFP('shell.ca-bhs2', 4, 2, 'aeace90bd0ecb5cd10243ce96660437ed179276a94ab654f3fd927154ef21e01'),
SSHFP('shell.us-nyc1', 4, 1, '92b1e670d749b48fc823d9ea841eea6a467c6286'),
SSHFP('shell.us-nyc1', 4, 2, '2e692fcb76344151e775d45fc9c28f7eee40d14b96d5fdcb55a796cce9e148db'),
SSHFP('shell.fr-nte2', 4, 1, 'edbc49824a13e4ed3ff5de622860fe58de26ddb1'),
SSHFP('shell.fr-nte2', 4, 2, '496536b9f8bb5b7df8ba8c7957cad6cc1df64b5a7f83e8b56d77b1f432c9b186'),
SSHFP('shell.fr-par1', 4, 1, '423759776aff4266c04bae3eb11fc9fbe6ea3233'),

View File

@ -1,5 +1,6 @@
var virtual = [
// insert here
[ 'wdev.tier2.fr-rbx2', 'fd42:4242:2601:2602:216:3eff:fe24:1331' ],
[ 'dns-edge.it-rom1', 'fd42:4242:2601:2b:d2f4:8ff:fec6:c157' ],
[ 'nginx.fr-par1', 'fd42:4242:2601:37:225f:faff:fe4e:f64c' ],
[ 'nats.tier2.de-fra1', 'fd42:4242:2601:3102:e2b8:99ff:febf:5a84' ],
@ -26,7 +27,6 @@ var virtual = [
[ 'peerfinder.fr-rbx1', 'fd42:4242:2601:36:7283:bfff:fe29:d7e4' ],
[ 'peerfinder.uk-lon1', 'fd42:4242:2601:35:7283:bfff:fe29:d7e4' ],
[ 'dns-edge.us-lax1', 'fd42:4242:2601:2a:d2f4:8ff:fec6:c157' ],
[ 'shell.tier2.fr-par1', 'fd42:4242:2601:3702:216:3eff:fea8:bca2' ],
[ 'dns-edge.fr-par1', 'fd42:4242:2601:37:d2f4:8ff:fec6:c157' ],
[ 'docker.tier1.ch-zur1', 'fd42:4242:2601:28:216:3eff:fe29:1c01' ],
[ 'docker.tier2.ch-zur1', 'fd42:4242:2601:2802:926f:e2ff:fe66:b75e' ],
@ -40,9 +40,9 @@ var virtual = [
[ 'docker.tier1.fr-rbx1', 'fd42:4242:2601:36:216:3eff:fe29:1c01' ],
[ 'docker.tier1.uk-lon1', 'fd42:4242:2601:35:216:3eff:fe29:1c01' ],
[ 'dns-edge.de-fra2', 'fd42:4242:2601:2c:d2f4:8ff:fec6:c157' ],
[ 'deploy.tier2.fr-rbx2', 'fd42:4242:2601:2602:216:3eff:fe27:aa1f' ],
[ 'shell.tier2.fr-rbx2', 'fd42:4242:2601:2602:216:3eff:fe93:4048' ],
[ 'registry.tier2.fr-rbx2', 'fd42:4242:2601:2602:216:3eff:feb8:68dd' ],
[ 'deploy.tier2.fr-rbx2', 'fd42:4242:2601:2602:216:3eff:fec9:211f' ],
[ 'shell.tier2.fr-rbx2', 'fd42:4242:2601:2602:216:3eff:fe07:cbf2' ],
[ 'registry.tier2.fr-rbx2', 'fd42:4242:2601:2602:216:3eff:fe9c:108f' ],
[ 'grafana.tier2.de-fra1', 'fd42:4242:2601:3102:52c3:baff:fee0:9def' ],
[ 'mysql.tier2.uk-lon1', 'fd42:4242:2601:3502:6291:1fff:fe63:f812' ],
[ 'pingotron.tier1.de-fra1', 'fd42:4242:2601:31:721d:15ff:feb3:cab6' ],
@ -54,13 +54,11 @@ var virtual = [
[ 'nginx.fr-rbx1', 'fd42:4242:2601:36:225f:faff:fe4e:f64c' ],
[ 'monitor.tier2.ca-bhs2', 'fd42:4242:2601:2d02:226:95ff:fe88:5812' ],
[ 'dns-master.ca-bhs2', 'fd42:4242:2601:2d:2234:1aff:feed:6755' ],
[ 'rsync.tier2.us-nyc1', 'fd42:4242:2601:2502:d2df:d7ff:fe86:283c' ],
[ 'cfprox.tier2.fr-rbx1', 'fd42:4242:2601:3602:c250:85ff:fea4:47fe' ],
[ 'cfprox.tier2.de-fra1', 'fd42:4242:2601:3102:c250:85ff:fea4:47fe' ],
[ 'cfprox.tier2.uk-lon1', 'fd42:4242:2601:3502:c250:85ff:fea4:47fe' ],
[ 'dns-edge.fr-rbx2', 'fd42:4242:2601:26:d2f4:8ff:fec6:c157' ],
[ 'dns-edge.uk-lon4', 'fd42:4242:2601:29:d2f4:8ff:fec6:c157' ],
[ 'dns-edge.us-nyc1', 'fd42:4242:2601:25:d2f4:8ff:fec6:c157' ],
[ 'ldap-slave.ca-bhs2', 'fd42:4242:2601:2d:7222:61ff:fec9:5bd0' ],
[ 'ldap-slave.fr-rbx1', 'fd42:4242:2601:36:7222:61ff:fec9:5bd0' ],
[ 'ldap-sync.tier2.uk-lon1', 'fd42:4242:2601:3502:425d:4dff:fe02:1b0b' ],