priv35: prepare

This commit is contained in:
Astro 2021-02-17 16:19:49 +01:00
parent ebd000f23a
commit c40ff50587
5 changed files with 42 additions and 2 deletions

View File

@ -439,3 +439,15 @@ dhcp:
routers: priv34-gw.priv34
string-opts:
domain-name: priv34.zentralwerk.org
priv35:
start: 172.20.76.2
end: 172.20.76.30
time: 120
max-time: 86400
opts:
domain-name-servers: "172.20.73.8, 9.9.9.9"
host-opts:
routers: priv35-gw.priv35
string-opts:
domain-name: priv35.zentralwerk.org

View File

@ -150,6 +150,7 @@ hosts-inet:
priv32-gw: 172.20.72.46
priv33-gw: 172.20.72.47
priv34-gw: 172.20.72.48
priv35-gw: 172.20.72.49
pub:
pub-gw: 172.20.78.1
@ -380,6 +381,11 @@ hosts-inet:
{%- for i in range(1, 14) %}
dhcp{{ i }}: 172.20.74.{{ 209 + i }}
{%- endfor %}
priv35:
priv35-gw: 172.20.76.1
{%- for i in range(1, 14) %}
dhcp{{ i }}: 172.20.76.{{ 1 + i }}
{%- endfor %}
radio:
radio-gw: 172.20.73.129
@ -520,6 +526,7 @@ hosts-inet6:
priv32-gw: fd23:42:c3d2:581::c:1f
priv33-gw: fd23:42:c3d2:581::c:20
priv34-gw: fd23:42:c3d2:581::c:21
priv35-gw: fd23:42:c3d2:581::c:22
freifunk: fd23:42:c3d2:581:8000::1
@ -600,7 +607,9 @@ hosts-inet6:
priv33:
priv33-gw: fd23:42:c3d2:5e0::1
priv34:
priv33-gw: fd23:42:c3d2:5e1::1
priv34-gw: fd23:42:c3d2:5e1::1
priv35:
priv35-gw: fd23:42:c3d2:5e2::1
radio:
radio-gw: fd23:42:c3d2:586::1
@ -685,6 +694,7 @@ hosts-inet6:
priv32-gw: 2a02:8106:211:e981::c:1f
priv33-gw: 2a02:8106:211:e981::c:20
priv34-gw: 2a02:8106:211:e981::c:21
priv35-gw: 2a02:8106:211:e981::c:22
radio:
radio-gw: 2a02:8106:208:5286::1
@ -757,3 +767,5 @@ hosts-inet6:
priv33-gw: 2a02:8106:211:e9e0::1
priv34:
priv34-gw: 2a02:8106:211:e9e1::1
priv35:
priv35-gw: 2a02:8106:211:e9e2::1

View File

@ -395,6 +395,17 @@ containers:
type: phys
hwaddr: 0A:14:48:01:2A:41
priv35-gw:
interfaces:
core:
type: veth
gw: upstream2
gw6: upstream2
hwaddr: 0A:14:48:01:2A:42
priv35:
type: phys
hwaddr: 0A:14:48:01:2A:43
upstream1:
interfaces:
core:

View File

@ -35,6 +35,7 @@ subnets-inet:
priv16: 172.20.75.224/28
priv32: 172.20.75.240/28
priv34: 172.20.74.208/28
priv35: 172.20.76.0/28
c3d2: 172.22.99.0/24
mgmt: 10.0.0.0/24
priv17: 172.20.73.128/27
@ -79,6 +80,7 @@ subnets-inet6:
priv32: fd23:42:c3d2:5df::/64
priv33: fd23:42:c3d2:5e0::/64
priv34: fd23:42:c3d2:5e1::/64
priv35: fd23:42:c3d2:5e2::/64
c3d2: fd23:42:c3d2:523::/64
up1:
c3d2: 2a02:8106:208:5201::/64
@ -121,3 +123,4 @@ subnets-inet6:
priv32: 2a02:8106:211:e9df::/64
priv33: 2a02:8106:211:e9e0::/64
priv34: 2a02:8106:211:e9e1::/64
priv35: 2a02:8106:211:e9e2::/64

View File

@ -43,7 +43,9 @@ Machine-readable here: [salt-pillar/subnets](./salt-pillar/subnets/init.sls)
* 172.20.75.208-172.20.75.223/28 PRIV31
* 172.20.75.224-172.20.75.239/28 PRIV16
* 172.20.75.240-172.20.75.255/28 PRIV32
* 172.20.76.0-172.20.77.255/23 RESERVED
* 172.20.76.0-172.20.76.255/24 RESERVED
* 172.20.76.0-172.20.76.31/28 PRIV35
* 172.20.77.0-172.20.77.255/24 RESERVED
* 172.20.78.0-172.20.79.255/23 PUBLIC
## RFC 1918: non-routed