Skip to content

Commit

Permalink
Changed DCG-2 to DC5-2
Browse files Browse the repository at this point in the history
  • Loading branch information
tim427 committed Nov 13, 2023
1 parent 7b31bf4 commit 73d2a14
Show file tree
Hide file tree
Showing 11 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions update-routers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion vars_example/dcg-1.router.nl.coloclue.net.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion vars_example/eunetworks-3.router.nl.coloclue.net.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions vars_example/generic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion vars_example/transit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 73d2a14

Please sign in to comment.