diff --git a/salt-pillar/dhcp/init.sls b/salt-pillar/dhcp/init.sls index c075c66..1a4f381 100644 --- a/salt-pillar/dhcp/init.sls +++ b/salt-pillar/dhcp/init.sls @@ -475,3 +475,15 @@ dhcp: routers: priv37-gw.priv37 string-opts: domain-name: priv37.zentralwerk.org + + priv38: + start: 172.20.76.194 + end: 172.20.76.206 + time: 120 + max-time: 86400 + opts: + domain-name-servers: "172.20.73.8, 9.9.9.9" + host-opts: + routers: priv38-gw.priv38 + string-opts: + domain-name: priv38.zentralwerk.org diff --git a/salt-pillar/hosts/init.sls b/salt-pillar/hosts/init.sls index 1c45777..9136a07 100644 --- a/salt-pillar/hosts/init.sls +++ b/salt-pillar/hosts/init.sls @@ -153,6 +153,7 @@ hosts-inet: priv35-gw: 172.20.72.49 priv36-gw: 172.20.72.50 priv37-gw: 172.20.72.51 + priv38-gw: 172.20.72.52 pub: pub-gw: 172.20.78.1 @@ -398,6 +399,11 @@ hosts-inet: {%- for i in range(1, 14) %} dhcp{{ i }}: 172.20.76.{{ 129 + i }} {%- endfor %} + priv38: + priv38-gw: 172.20.76.193 +{%- for i in range(1, 14) %} + dhcp{{ i }}: 172.20.76.{{ 193 + i }} +{%- endfor %} radio: radio-gw: 172.20.73.129 @@ -541,6 +547,7 @@ hosts-inet6: priv35-gw: fd23:42:c3d2:581::c:22 priv36-gw: fd23:42:c3d2:581::c:23 priv37-gw: fd23:42:c3d2:581::c:24 + priv38-gw: fd23:42:c3d2:581::c:25 freifunk: fd23:42:c3d2:581:8000::1 @@ -628,6 +635,8 @@ hosts-inet6: priv36-gw: fd23:42:c3d2:5e3::1 priv37: priv37-gw: fd23:42:c3d2:5e4::1 + priv38: + priv38-gw: fd23:42:c3d2:5e5::1 radio: radio-gw: fd23:42:c3d2:586::1 @@ -715,6 +724,7 @@ hosts-inet6: priv35-gw: 2a02:8106:211:e981::c:22 priv36-gw: 2a02:8106:211:e981::c:23 priv37-gw: 2a02:8106:211:e981::c:24 + priv38-gw: 2a02:8106:211:e981::c:25 radio: radio-gw: 2a02:8106:208:5286::1 @@ -793,3 +803,5 @@ hosts-inet6: priv36-gw: 2a02:8106:211:e9e3::1 priv37: priv37-gw: 2a02:8106:211:e9e4::1 + priv38: + priv38-gw: 2a02:8106:211:e9e5::1 diff --git a/salt-pillar/lxc-containers/server1.sls b/salt-pillar/lxc-containers/server1.sls index 64b55c9..50e2726 100644 --- a/salt-pillar/lxc-containers/server1.sls +++ b/salt-pillar/lxc-containers/server1.sls @@ -428,6 +428,17 @@ containers: type: phys hwaddr: 0A:14:48:01:2A:47 + priv38-gw: + interfaces: + core: + type: veth + gw: upstream2 + gw6: upstream2 + hwaddr: 0A:14:48:01:2A:48 + priv38: + type: phys + hwaddr: 0A:14:48:01:2A:49 + upstream1: interfaces: core: diff --git a/salt-pillar/subnets/init.sls b/salt-pillar/subnets/init.sls index 7167db6..68632ac 100644 --- a/salt-pillar/subnets/init.sls +++ b/salt-pillar/subnets/init.sls @@ -38,6 +38,7 @@ subnets-inet: priv35: 172.20.76.0/28 priv36: 172.20.76.64/28 priv37: 172.20.76.128/28 + priv38: 172.20.76.192/28 c3d2: 172.22.99.0/24 mgmt: 10.0.0.0/24 priv17: 172.20.73.128/27 @@ -85,6 +86,7 @@ subnets-inet6: priv35: fd23:42:c3d2:5e2::/64 priv36: fd23:42:c3d2:5e3::/64 priv37: fd23:42:c3d2:5e4::/64 + priv38: fd23:42:c3d2:5e5::/64 c3d2: fd23:42:c3d2:523::/64 up1: c3d2: 2a02:8106:208:5201::/64 @@ -130,3 +132,4 @@ subnets-inet6: priv35: 2a02:8106:211:e9e2::/64 priv36: 2a02:8106:211:e9e3::/64 priv37: 2a02:8106:211:e9e4::/64 + priv38: 2a02:8106:211:e9e5::/64 diff --git a/subnets.md b/subnets.md index d10fdb6..b885464 100644 --- a/subnets.md +++ b/subnets.md @@ -47,6 +47,7 @@ Machine-readable here: [salt-pillar/subnets](./salt-pillar/subnets/init.sls) * 172.20.76.0-172.20.76.31/28 PRIV35 * 172.20.76.64-172.20.76.79/28 PRIV36 * 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 RESERVED * 172.20.78.0-172.20.79.255/23 PUBLIC