diff --git a/salt-pillar/bird/radv.sls b/salt-pillar/bird/radv.sls index 49d3ac1..1e0f5da 100644 --- a/salt-pillar/bird/radv.sls +++ b/salt-pillar/bird/radv.sls @@ -11,6 +11,12 @@ radv: - dnscache.serv dnssl: - serv.zentralwerk.org + cluster-gw: + serv: + rdnss: + - dnscache.serv + dnssl: + - cluster.zentralwerk.org c3d2-gw: c3d2: rdnss: diff --git a/salt-pillar/hosts/init.sls b/salt-pillar/hosts/init.sls index 850fe77..f2c7789 100644 --- a/salt-pillar/hosts/init.sls +++ b/salt-pillar/hosts/init.sls @@ -130,7 +130,7 @@ hosts-inet: priv16-gw: 172.20.72.26 bgp: 172.20.72.27 mgmt-gw: 172.20.72.28 - radio-gw: 172.20.72.29 + cluster-gw: 172.20.72.29 priv17-gw: 172.20.72.30 priv18-gw: 172.20.72.31 priv19-gw: 172.20.72.32 @@ -408,9 +408,9 @@ hosts-inet: dhcp{{ i }}: 172.20.76.{{ 193 + i }} {%- endfor %} priv39: - priv39-gw: 172.20.77.1 + priv39-gw: 172.20.77.129 {%- for i in range(1, 14) %} - dhcp{{ i }}: 172.20.77.{{ 1 + i }} + dhcp{{ i }}: 172.20.77.{{ 129 + i }} {%- endfor %} priv40: priv40-gw: 172.20.77.65 @@ -418,8 +418,11 @@ hosts-inet: dhcp{{ i }}: 172.20.77.{{ 65 + i }} {%- endfor %} - radio: - radio-gw: 172.20.73.129 + cluster: + cluster-gw: 172.20.77.1 +{%- for i in range(2, 31) %} + server{{ i }}: 172.20.77.{{ i }} +{%- endfor %} c3d2: c3d2-anon: 172.22.99.1 @@ -658,8 +661,11 @@ hosts-inet6: priv40: priv40-gw: fd23:42:c3d2:5e7::1 - radio: - radio-gw: fd23:42:c3d2:586::1 + cluster: + cluster-gw: fd23:42:c3d2:586::1 +{%- for i in range(2, 31) %} + server{{ i }}: fd23:42:c3d2:586::1{{ i }} +{%- endfor %} c3d2: c3d2-anon: fd23:42:c3d2:523::c3d2:1 @@ -678,8 +684,8 @@ hosts-inet6: c3d2-anon: 2a02:8106:208:5281::c3d2:a bgp: 2a02:8106:208:5281::c3d2:b mgmt-gw: 2a02:8106:208:5281::8:3 - upstream1: 2a02:8106:208:5281::b:0 + cluster-gw: 2a02:8106:208:5281::8:4 freifunk: 2a02:8106:208:5281:8000::1 yggdrasil: 2a02:8106:208:5281:9000::1 @@ -693,6 +699,12 @@ hosts-inet6: dnscache: 2a02:8106:208:5282:f096:dbff:fee8:427d minetest: 2a02:8106:208:5282:c3a:42ff:fe5d:b20c + cluster: + cluster-gw: 2a02:8106:208:5284::1 +{%- for i in range(2, 31) %} + server{{ i }}: 2a02:8106:208:5284::1{{ i }} +{%- endfor %} + pub: pub-gw: 2a02:8106:208:5283::1 @@ -749,9 +761,6 @@ hosts-inet6: priv39-gw: 2a02:8106:211:e981::c:26 priv40-gw: 2a02:8106:211:e981::c:27 - radio: - radio-gw: 2a02:8106:208:5286::1 - priv1: priv1-gw: 2a02:8106:211:e9c0::1 priv2: diff --git a/salt-pillar/lxc-containers/server1.sls b/salt-pillar/lxc-containers/server1.sls index 6982fc1..1c97c6f 100644 --- a/salt-pillar/lxc-containers/server1.sls +++ b/salt-pillar/lxc-containers/server1.sls @@ -21,6 +21,17 @@ containers: type: veth hwaddr: 0A:14:48:01:06:00 + cluster-gw: + interfaces: + core: + type: veth + gw: upstream1 + gw6: upstream1 + hwaddr: 0A:14:48:01:06:03 + cluster: + type: veth + hwaddr: 0A:14:48:01:06:02 + priv1-gw: interfaces: core: diff --git a/salt-pillar/subnets/init.sls b/salt-pillar/subnets/init.sls index 574abee..c8e7ead 100644 --- a/salt-pillar/subnets/init.sls +++ b/salt-pillar/subnets/init.sls @@ -39,11 +39,12 @@ subnets-inet: priv36: 172.20.76.64/28 priv37: 172.20.76.128/28 priv38: 172.20.76.192/28 - priv39: 172.20.77.0/28 + priv39: 172.20.77.128/28 priv40: 172.20.77.64/28 c3d2: 172.22.99.0/24 mgmt: 10.0.0.0/24 priv17: 172.20.73.128/27 + cluster: 172.20.77.0/27 subnets-inet6: dn42: diff --git a/salt-pillar/switches/init.sls b/salt-pillar/switches/init.sls index b3ebde2..b3097c7 100644 --- a/salt-pillar/switches/init.sls +++ b/salt-pillar/switches/init.sls @@ -23,6 +23,7 @@ switches: - serv - pub - c3d2 + - cluster - bmx - priv1 - priv2 @@ -163,6 +164,7 @@ switches: - core - serv - c3d2 + - cluster - up1 - up2 - up3 @@ -224,6 +226,7 @@ switches: - core - serv - c3d2 + - cluster - bmx - priv23 c3d2-server5: diff --git a/salt-pillar/top.sls b/salt-pillar/top.sls index 3f61132..100fcd3 100644 --- a/salt-pillar/top.sls +++ b/salt-pillar/top.sls @@ -21,9 +21,9 @@ base: - bird.ospf 'pub-gw': - collectd.gw - 'c3d2-gw or c3d2-anon or mgmt-gw': + 'c3d2-gw or c3d2-anon or mgmt-gw or cluster-gw': - bird.ospf - 'c3d2-gw': + 'c3d2-gw or cluster-gw': - bird.radv 'bgp': - bird.ospf diff --git a/salt-pillar/vlans/init.sls b/salt-pillar/vlans/init.sls index d94a52c..94fceb8 100644 --- a/salt-pillar/vlans/init.sls +++ b/salt-pillar/vlans/init.sls @@ -9,6 +9,7 @@ vlans: pub: 4 # C3D2 home network c3d2: 5 + cluster: 6 bmx: 7 # Modems {%- for i in range(1, 9) %} diff --git a/subnets.md b/subnets.md index 82a45ae..1ea2c44 100644 --- a/subnets.md +++ b/subnets.md @@ -49,8 +49,9 @@ Machine-readable here: [salt-pillar/subnets](./salt-pillar/subnets/init.sls) * 172.20.76.128-172.20.76.143/28 PRIV37 * 172.20.76.192-172.20.76.207/28 PRIV38 * 172.20.77.0-172.20.77.255/24 - * 172.20.77.0-172.20.77.31/28 PRIV39 + * 172.20.77.0-172.20.77.31/27 CLUSTER * 172.20.77.64-172.20.77.79/28 PRIV40 + * 172.20.77.128-172.20.77.143/28 PRIV39 * 172.20.78.0-172.20.79.255/23 PUBLIC ## RFC 1918: non-routed @@ -65,6 +66,7 @@ Machine-readable here: [salt-pillar/subnets](./salt-pillar/subnets/init.sls) * fd23:42:c3d2:581::/64 CORE * fd23:42:c3d2:582::/64 SERV * fd23:42:c3d2:583::/64 PUBLIC +* fd23:42:c3d2:584::/64 CLUSTER * fd23:42:c3d2:5c0::/64 PRIV1 * fd23:42:c3d2:5c1::/64 PRIV2 * fd23:42:c3d2:5c2::/64 PRIV3 @@ -97,6 +99,7 @@ Machine-readable here: [salt-pillar/subnets](./salt-pillar/subnets/init.sls) * 2a02:8106:208:5281::/64 CORE * 2a02:8106:208:5282::/64 SERV * 2a02:8106:208:5283::/64 PUBLIC + * 2a02:8106:208:5284::/64 CLUSTER * 2a02:8106:211:e900::/56 (up2) * 2a02:8106:211:e980::/57 ZW * 2a02:8106:211:e9c0::/64 PRIV1