winzlieb/network
winzlieb
/
network
forked from zentralwerk/network
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

lxc-containers: prepare upstream3, upstream4

This commit is contained in:
Astro 2021-05-22 01:02:01 +02:00
parent ffb79105ab
commit 68afa61ca1
2 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nix/lib/config/legacy.nix
View File

@ -102,12 +102,14 @@ in
upstream2.ospf.upstreamInstance = 4;
anon1.ospf.upstreamInstance = 5;
freifunk.ospf.upstreamInstance = 6;
c3d2-gw.ospf.allowedUpstreams = [ "upstream1" "upstream2" "freifunk" ];
serv-gw.ospf.allowedUpstreams = [ "upstream1" "upstream2" "freifunk" ];
cls-gw.ospf.allowedUpstreams = [ "upstream1" "upstream2" "freifunk" ];
mgmt-gw.ospf.allowedUpstreams = [ "upstream1" "upstream2" "freifunk" ];
bgp.ospf.allowedUpstreams = [ "upstream1" "upstream2" "freifunk" ];
anon1.ospf.allowedUpstreams = [ "upstream1" "upstream2" "freifunk" ];
upstream3.ospf.upstreamInstance = 7;
upstream4.ospf.upstreamInstance = 8;
c3d2-gw.ospf.allowedUpstreams = [ "upstream4" "upstream1" "upstream3" "upstream2" "freifunk" ];
serv-gw.ospf.allowedUpstreams = [ "upstream4" "upstream1" "upstream3" "upstream2" "freifunk" ];
cls-gw.ospf.allowedUpstreams = [ "upstream4" "upstream1" "upstream3" "upstream2" "freifunk" ];
mgmt-gw.ospf.allowedUpstreams = [ "upstream4" "upstream1" "upstream3" "upstream2" "freifunk" ];
bgp.ospf.allowedUpstreams = [ "upstream4" "upstream1" "upstream3" "upstream2" "freifunk" ];
anon1.ospf.allowedUpstreams = [ "upstream4" "upstream1" "upstream3" "upstream2" "freifunk" ];
pub-gw.ospf.allowedUpstreams = [ "anon1" "freifunk" ];
c3d2-anon.ospf.allowedUpstreams = [ "anon1" "freifunk" ];
@ -116,7 +118,7 @@ in
# host priv*-gw settings
(
builtins.mapAttrs (hostName: _: {
ospf.allowedUpstreams = [ "upstream2" "upstream1" "freifunk" ];
ospf.allowedUpstreams = [ "upstream4" "upstream2" "upstream3" "upstream1" "freifunk" ];
}) (
lib.filterAttrs (hostName: _:
builtins.match "priv[[:digit:]]+-gw" hostName != null

18
salt-pillar/lxc-containers/server1.sls
View File

@ -494,6 +494,24 @@ containers:
# modem that is bridge mode
hwaddr: 00:23:74:D7:42:7C
upstream3:
interfaces:
core:
type: veth
hwaddr: 0A:14:48:01:28:00
up3:
type: phys
hwaddr: 00:23:74:D7:42:7D
upstream4:
interfaces:
core:
type: veth
hwaddr: 0A:14:48:01:29:00
up4:
type: phys
hwaddr: 00:23:74:D7:42:7E
anon1:
interfaces:
core: