priv38: prepare

This commit is contained in:
Astro 2021-02-19 16:21:11 +01:00
parent 62e0058832
commit 117ac111dc
5 changed files with 39 additions and 0 deletions

View File

@ -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

View File

@ -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

View File

@ -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:

View File

@ -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

View File

@ -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