From 73d2a1494de9b1802b1ce4e570d8e89e3d4c392b Mon Sep 17 00:00:00 2001 From: Tim de Boer Date: Mon, 13 Nov 2023 23:24:09 +0100 Subject: [PATCH] Changed DCG-2 to DC5-2 --- README.md | 4 ++-- .../bird.conf | 0 .../bird6.conf | 0 .../peerings/.gitkeep | 0 .../rpki/.gitkeep | 0 update-routers.sh | 6 +++--- ...nl.coloclue.net.yml => dc5-2.router.nl.coloclue.net.yml} | 2 +- vars_example/dcg-1.router.nl.coloclue.net.yml | 2 +- vars_example/eunetworks-3.router.nl.coloclue.net.yml | 2 +- vars_example/generic.yml | 6 +++--- vars_example/transit.yml | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) rename blobs_example/{dcg-2.router.nl.coloclue.net => dcg-5.router.nl.coloclue.net}/bird.conf (100%) rename blobs_example/{dcg-2.router.nl.coloclue.net => dcg-5.router.nl.coloclue.net}/bird6.conf (100%) rename blobs_example/{dcg-2.router.nl.coloclue.net => dcg-5.router.nl.coloclue.net}/peerings/.gitkeep (100%) rename blobs_example/{dcg-2.router.nl.coloclue.net => dcg-5.router.nl.coloclue.net}/rpki/.gitkeep (100%) rename vars_example/{dcg-2.router.nl.coloclue.net.yml => dc5-2.router.nl.coloclue.net.yml} (94%) diff --git a/README.md b/README.md index 66d5462..ed5a449 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ Repository layout: │   │   ├── bird6.conf <- Static config for bird6 (IPv6 definition on the routers) │   │   ├── peerings <- Filled by peering_filters │   │   └── rpki <- Filled by rtrsub - │   ├── dcg-2.router.nl.coloclue.net + │   ├── dc5-2.router.nl.coloclue.net │   │   ├── bird.conf │   │   ├── bird6.conf │   │   ├── peerings @@ -77,7 +77,7 @@ Repository layout: ├── update-routers.sh └── vars ├── dcg-1.router.nl.coloclue.net.yml - ├── dcg-2.router.nl.coloclue.net.yml + ├── dc5-2.router.nl.coloclue.net.yml ├── eunetworks-2.router.nl.coloclue.net.yml ├── generic.yml <- generic KEES settings and inventory for routers and IXPs ├── members_bgp.yml <- ips & prefixes of members with BGP diff --git a/blobs_example/dcg-2.router.nl.coloclue.net/bird.conf b/blobs_example/dcg-5.router.nl.coloclue.net/bird.conf similarity index 100% rename from blobs_example/dcg-2.router.nl.coloclue.net/bird.conf rename to blobs_example/dcg-5.router.nl.coloclue.net/bird.conf diff --git a/blobs_example/dcg-2.router.nl.coloclue.net/bird6.conf b/blobs_example/dcg-5.router.nl.coloclue.net/bird6.conf similarity index 100% rename from blobs_example/dcg-2.router.nl.coloclue.net/bird6.conf rename to blobs_example/dcg-5.router.nl.coloclue.net/bird6.conf diff --git a/blobs_example/dcg-2.router.nl.coloclue.net/peerings/.gitkeep b/blobs_example/dcg-5.router.nl.coloclue.net/peerings/.gitkeep similarity index 100% rename from blobs_example/dcg-2.router.nl.coloclue.net/peerings/.gitkeep rename to blobs_example/dcg-5.router.nl.coloclue.net/peerings/.gitkeep diff --git a/blobs_example/dcg-2.router.nl.coloclue.net/rpki/.gitkeep b/blobs_example/dcg-5.router.nl.coloclue.net/rpki/.gitkeep similarity index 100% rename from blobs_example/dcg-2.router.nl.coloclue.net/rpki/.gitkeep rename to blobs_example/dcg-5.router.nl.coloclue.net/rpki/.gitkeep diff --git a/update-routers.sh b/update-routers.sh index fd188b3..a3be1ee 100755 --- a/update-routers.sh +++ b/update-routers.sh @@ -8,8 +8,8 @@ if [ "${1}" == '-d' -o "${1}" == '--debug' ]; then arguments='debug' fi -#routers='dcg-1.router.nl.coloclue.net dcg-2.router.nl.coloclue.net eunetworks-2.router.nl.coloclue.net eunetworks-3.router.nl.coloclue.net' -routers='dcg-1.router.nl.coloclue.net dcg-2.router.nl.coloclue.net eunetworks-2.router.nl.coloclue.net eunetworks-3.router.nl.coloclue.net' +#routers='dcg-1.router.nl.coloclue.net dc5-2.router.nl.coloclue.net eunetworks-2.router.nl.coloclue.net eunetworks-3.router.nl.coloclue.net' +routers='dcg-1.router.nl.coloclue.net dc5-2.router.nl.coloclue.net eunetworks-2.router.nl.coloclue.net eunetworks-3.router.nl.coloclue.net' . functions.sh @@ -59,7 +59,7 @@ for router in ${routers}; do ./gentool -6 -y vars/generic.yml vars/${router}.yml vars/scrubbers.yml -t templates/via_scrubbers_afi.j2 -o ${STAGEDIR}/${router}/via_scrubbers_ipv6.conf # DCG specific stuff - if [ "${router}" == "dcg-1.router.nl.coloclue.net" ] || [ "${router}" == "dcg-2.router.nl.coloclue.net" ]; then + if [ "${router}" == "dcg-1.router.nl.coloclue.net" ] || [ "${router}" == "dc5-2.router.nl.coloclue.net" ]; then ./gentool -4 -t templates/static_routes.j2 -y vars/statics-dcg.yml -o ${STAGEDIR}/${router}/static_routes-ipv4.conf ./gentool -6 -t templates/static_routes.j2 -y vars/statics-dcg.yml -o ${STAGEDIR}/${router}/static_routes-ipv6.conf # EUNetworks specific stuff diff --git a/vars_example/dcg-2.router.nl.coloclue.net.yml b/vars_example/dc5-2.router.nl.coloclue.net.yml similarity index 94% rename from vars_example/dcg-2.router.nl.coloclue.net.yml rename to vars_example/dc5-2.router.nl.coloclue.net.yml index d1f2673..c84600b 100644 --- a/vars_example/dcg-2.router.nl.coloclue.net.yml +++ b/vars_example/dc5-2.router.nl.coloclue.net.yml @@ -1,4 +1,4 @@ -hostname: "dcg-2.router.nl.coloclue.net" +hostname: "dc5-2.router.nl.coloclue.net" shortname: "dcg2" router_id: "94.142.247.2" diff --git a/vars_example/dcg-1.router.nl.coloclue.net.yml b/vars_example/dcg-1.router.nl.coloclue.net.yml index 4e24778..f907e84 100644 --- a/vars_example/dcg-1.router.nl.coloclue.net.yml +++ b/vars_example/dcg-1.router.nl.coloclue.net.yml @@ -6,7 +6,7 @@ router_id: "94.142.247.1" interfaces: backbone: - nic: "lo" # loopback - - nic: "enp1s0f3" # internal wire to dcg-2 + - nic: "enp1s0f3" # internal wire to dc5-2 cost: 100 maintenance: False - nic: "eno1.130" # backbone to eunetworks-2 diff --git a/vars_example/eunetworks-3.router.nl.coloclue.net.yml b/vars_example/eunetworks-3.router.nl.coloclue.net.yml index 09a4be1..eeeed7a 100644 --- a/vars_example/eunetworks-3.router.nl.coloclue.net.yml +++ b/vars_example/eunetworks-3.router.nl.coloclue.net.yml @@ -9,7 +9,7 @@ interfaces: - nic: "enp1s0f3" # internal wire to eunetworks-2 cost: 100 maintenance: False - - nic: "eno1.130" # backbone to dcg-2 + - nic: "eno1.130" # backbone to dc5-2 cost: 200 bfd: True maintenance: False diff --git a/vars_example/generic.yml b/vars_example/generic.yml index 7221b37..4d5d438 100644 --- a/vars_example/generic.yml +++ b/vars_example/generic.yml @@ -109,7 +109,7 @@ bgp: graceful_shutdown: false maintenance_mode: false "dcg2": - fqdn: dcg-2.router.nl.coloclue.net + fqdn: dc5-2.router.nl.coloclue.net ipv4: 94.142.247.2 ipv6: 2a02:898:0:300::2 vendor: bird @@ -137,7 +137,7 @@ ixp_map: ipv6_range: 2001:7f8:10f::205b:0/64 present_on: - eunetworks-3.router.nl.coloclue.net - - dcg-2.router.nl.coloclue.net + - dc5-2.router.nl.coloclue.net decix: ixp_community: 31 ipv4_range: 80.81.192.0/21 @@ -158,7 +158,7 @@ ixp_map: ipv6_range: 2001:7f8:24::/64 bgp_local_pref: 90 present_on: - - dcg-2.router.nl.coloclue.net + - dc5-2.router.nl.coloclue.net private-eun: ipv4_range: 62.115.144.32/31 ipv6_range: 2001:2000:3080:0ebc::/126 diff --git a/vars_example/transit.yml b/vars_example/transit.yml index f8a13e8..ff025c0 100644 --- a/vars_example/transit.yml +++ b/vars_example/transit.yml @@ -47,7 +47,7 @@ transit: graceful_shutdown: False admin_down_state: False block_importexport: False - dcg-2: + dc5-2: - ip4: 172.27.1.1 ip6: fd00:27:1::1:1 graceful_shutdown: False