duplicate c3d2-gw into c3d2-gw{1,2,3}

This commit is contained in:
Astro 2021-05-27 15:17:45 +02:00
parent 1a5bc6e69b
commit 78e528d024
6 changed files with 46 additions and 18 deletions

View File

@ -112,7 +112,9 @@ in
freifunk.ospf.upstreamInstance = 6; freifunk.ospf.upstreamInstance = 6;
upstream3.ospf.upstreamInstance = 7; upstream3.ospf.upstreamInstance = 7;
upstream4.ospf.upstreamInstance = 8; upstream4.ospf.upstreamInstance = 8;
c3d2-gw.ospf.allowedUpstreams = [ "upstream4" "upstream1" "upstream3" "upstream2" "anon1" "freifunk" ]; c3d2-gw1.ospf.allowedUpstreams = [ "upstream3" "upstream4" "upstream1" "upstream2" "anon1" "freifunk" ];
c3d2-gw2.ospf.allowedUpstreams = [ "upstream1" "upstream3" "upstream4" "upstream2" "anon1" "freifunk" ];
c3d2-gw3.ospf.allowedUpstreams = [ "upstream4" "upstream3" "upstream1" "upstream2" "anon1" "freifunk" ];
serv-gw.ospf.allowedUpstreams = [ "upstream4" "upstream1" "upstream3" "upstream2" "anon1" "freifunk" ]; serv-gw.ospf.allowedUpstreams = [ "upstream4" "upstream1" "upstream3" "upstream2" "anon1" "freifunk" ];
cls-gw.ospf.allowedUpstreams = [ "upstream4" "upstream1" "upstream3" "upstream2" "anon1" "freifunk" ]; cls-gw.ospf.allowedUpstreams = [ "upstream4" "upstream1" "upstream3" "upstream2" "anon1" "freifunk" ];
mgmt-gw.ospf.allowedUpstreams = [ "upstream4" "upstream1" "upstream3" "upstream2" "anon1" "freifunk" ]; mgmt-gw.ospf.allowedUpstreams = [ "upstream4" "upstream1" "upstream3" "upstream2" "anon1" "freifunk" ];

View File

@ -17,7 +17,7 @@ radv:
- dnscache.serv - dnscache.serv
dnssl: dnssl:
- cluster.zentralwerk.org - cluster.zentralwerk.org
c3d2-gw: c3d2-gw1:
c3d2: c3d2:
rdnss: rdnss:
- dnscache.serv - dnscache.serv

View File

@ -109,7 +109,7 @@ hosts-inet:
priv2-gw: 172.20.72.5 priv2-gw: 172.20.72.5
upstream1: 172.20.72.6 upstream1: 172.20.72.6
anon1: 172.20.72.7 anon1: 172.20.72.7
c3d2-gw: 172.20.72.8 c3d2-gw1: 172.20.72.8
c3d2-anon: 172.20.72.9 c3d2-anon: 172.20.72.9
upstream2: 172.20.72.10 upstream2: 172.20.72.10
upstream3: 172.20.72.11 upstream3: 172.20.72.11
@ -157,6 +157,8 @@ hosts-inet:
priv39-gw: 172.20.72.60 priv39-gw: 172.20.72.60
priv40-gw: 172.20.72.61 priv40-gw: 172.20.72.61
yggdrasil: 172.20.72.62 yggdrasil: 172.20.72.62
c3d2-gw2: 172.20.72.63
c3d2-gw3: 172.20.72.64
pub: pub:
pub-gw: 172.20.78.1 pub-gw: 172.20.78.1
@ -301,7 +303,9 @@ hosts-inet:
c3d2: c3d2:
c3d2-anon: 172.22.99.1 c3d2-anon: 172.22.99.1
c3d2-gw: 172.22.99.4 c3d2-gw1: 172.22.99.2
c3d2-gw2: 172.22.99.3
c3d2-gw3: 172.22.99.4
bgp: 172.22.99.250 bgp: 172.22.99.250
hosts-inet-extra: hosts-inet-extra:
@ -391,7 +395,9 @@ hosts-inet6:
anon1: fd23:42:c3d2:581::9:1 anon1: fd23:42:c3d2:581::9:1
serv-gw: fd23:42:c3d2:581::8:1 serv-gw: fd23:42:c3d2:581::8:1
pub-gw: fd23:42:c3d2:581::8:2 pub-gw: fd23:42:c3d2:581::8:2
c3d2-gw: fd23:42:c3d2:581::c3d2:1 c3d2-gw1: fd23:42:c3d2:581::c3d2:1
c3d2-gw2: fd23:42:c3d2:581::c3d2:2
c3d2-gw3: fd23:42:c3d2:581::c3d2:3
c3d2-anon: fd23:42:c3d2:581::c3d2:a c3d2-anon: fd23:42:c3d2:581::c3d2:a
bgp: fd23:42:c3d2:581::c3d2:b bgp: fd23:42:c3d2:581::c3d2:b
mgmt-gw: fd23:42:c3d2:581::8:3 mgmt-gw: fd23:42:c3d2:581::8:3
@ -545,7 +551,9 @@ hosts-inet6:
c3d2: c3d2:
c3d2-anon: fd23:42:c3d2:523::c3d2:1 c3d2-anon: fd23:42:c3d2:523::c3d2:1
c3d2-gw: fd23:42:c3d2:523::c3d2:4 c3d2-gw1: fd23:42:c3d2:523::c3d2:2
c3d2-gw2: fd23:42:c3d2:523::c3d2:3
c3d2-gw3: fd23:42:c3d2:523::c3d2:4
bgp: fd23:42:c3d2:523::c3d2:ff0b bgp: fd23:42:c3d2:523::c3d2:ff0b
up1: up1:
@ -555,7 +563,9 @@ hosts-inet6:
anon1: 2a02:8106:208:5281::9:1 anon1: 2a02:8106:208:5281::9:1
serv-gw: 2a02:8106:208:5281::8:1 serv-gw: 2a02:8106:208:5281::8:1
c3d2-gw: 2a02:8106:208:5281::c3d2:1 c3d2-gw1: 2a02:8106:208:5281::c3d2:1
c3d2-gw2: 2a02:8106:208:5281::c3d2:2
c3d2-gw3: 2a02:8106:208:5281::c3d2:3
c3d2-anon: 2a02:8106:208:5281::c3d2:a c3d2-anon: 2a02:8106:208:5281::c3d2:a
bgp: 2a02:8106:208:5281::c3d2:b bgp: 2a02:8106:208:5281::c3d2:b
mgmt-gw: 2a02:8106:208:5281::8:3 mgmt-gw: 2a02:8106:208:5281::8:3
@ -583,7 +593,9 @@ hosts-inet6:
c3d2: c3d2:
c3d2-anon: 2a02:8106:208:5201::c3d2:1 c3d2-anon: 2a02:8106:208:5201::c3d2:1
c3d2-gw: 2a02:8106:208:5201::c3d2:4 c3d2-gw1: 2a02:8106:208:5201::c3d2:2
c3d2-gw2: 2a02:8106:208:5201::c3d2:3
c3d2-gw3: 2a02:8106:208:5201::c3d2:4
bgp: 2a02:8106:208:5201::c3d2:ff0b bgp: 2a02:8106:208:5201::c3d2:ff0b
up2: up2:

View File

@ -518,27 +518,41 @@ containers:
type: veth type: veth
hwaddr: 0A:14:48:01:14:00 hwaddr: 0A:14:48:01:14:00
c3d2-gw: c3d2-gw1:
interfaces: interfaces:
core: core:
type: veth type: veth
# gw: upstream1
# gw6: upstream1
hwaddr: 0A:14:48:01:21:00 hwaddr: 0A:14:48:01:21:00
c3d2: c3d2:
type: veth type: veth
hwaddr: 0A:14:48:01:21:01 hwaddr: 0A:14:48:01:21:01
c3d2-gw2:
interfaces:
core:
type: veth
hwaddr: 0A:14:48:01:21:02
c3d2:
type: veth
hwaddr: 0A:14:48:01:21:03
c3d2-gw3:
interfaces:
core:
type: veth
hwaddr: 0A:14:48:01:21:04
c3d2:
type: veth
hwaddr: 0A:14:48:01:21:05
c3d2-anon: c3d2-anon:
interfaces: interfaces:
core: core:
type: veth type: veth
# gw: anon1 hwaddr: 0A:14:48:01:07:04
# gw6: anon1
hwaddr: 0A:14:48:01:07:01
c3d2: c3d2:
type: veth type: veth
hwaddr: 0A:14:48:01:07:00 hwaddr: 0A:14:48:01:07:05
bgp: bgp:
interfaces: interfaces:

View File

@ -28,9 +28,9 @@ base:
- bird.ospf - bird.ospf
'pub-gw': 'pub-gw':
- collectd.gw - collectd.gw
'c3d2-gw or c3d2-anon or mgmt-gw or cls-gw': 'c3d2-gw* or c3d2-anon or mgmt-gw or cls-gw':
- bird.ospf - bird.ospf
'c3d2-gw or cls-gw': 'c3d2-gw1 or cls-gw':
- bird.radv - bird.radv
'bgp': 'bgp':
- bird.ospf - bird.ospf

View File

@ -19,7 +19,7 @@ base:
'pub-gw': 'pub-gw':
- dhcp - dhcp
- collectd - collectd
'pub-gw or serv-gw or cls-gw or c3d2-gw or c3d2-anon or mgmt-gw': 'pub-gw or serv-gw or cls-gw or c3d2-gw* or c3d2-anon or mgmt-gw':
- no-ssh - no-ssh
- forwarding - forwarding
- bird - bird