remove unused coloradio net

This commit is contained in:
Astro 2021-02-08 16:56:49 +01:00
parent 7d18188a64
commit dbe3730ca7
7 changed files with 2 additions and 32 deletions

View File

@ -411,15 +411,3 @@ dhcp:
routers: priv32-gw.priv32
string-opts:
domain-name: priv32.zentralwerk.org
radio:
start: 172.20.73.130
end: 172.20.73.190
time: 120
max-time: 86400
opts:
domain-name-servers: "172.20.73.8, 9.9.9.9"
host-opts:
routers: radio-gw.radio
string-opts:
domain-name: radio.zentralwerk.org

View File

@ -476,14 +476,3 @@ containers:
gw: serv-gw
gw6: serv-gw
hwaddr: 0A:14:48:01:25:00
radio-gw:
interfaces:
core:
type: veth
gw: upstream2
gw6: upstream2
hwaddr: 0A:14:48:01:06:02
radio:
type: veth
hwaddr: 0A:14:48:01:06:00

View File

@ -36,7 +36,6 @@ subnets-inet:
priv32: 172.20.75.240/28
c3d2: 172.22.99.0/24
mgmt: 10.0.0.0/24
radio: 172.20.73.128/26
subnets-inet6:
dn42:
@ -44,7 +43,6 @@ subnets-inet6:
core: fd23:42:c3d2:581::/64
serv: fd23:42:c3d2:582::/64
pub: fd23:42:c3d2:583::/64
radio: fd23:42:c3d2:586::/64
priv1: fd23:42:c3d2:5c0::/64
priv2: fd23:42:c3d2:5c1::/64
priv3: fd23:42:c3d2:5c2::/64
@ -85,7 +83,6 @@ subnets-inet6:
pub: 2a02:8106:208:5283::/64
up2:
core: 2a02:8106:211:e981::/64
radio: 2a02:8106:211:e986::/64
priv1: 2a02:8106:211:e9c0::/64
priv2: 2a02:8106:211:e9c1::/64
priv3: 2a02:8106:211:e9c2::/64

View File

@ -23,7 +23,6 @@ switches:
- serv
- pub
- c3d2
- radio
- bmx
- priv1
- priv2
@ -157,7 +156,6 @@ switches:
- core
- serv
- c3d2
- radio
- up1
- up2
- up3
@ -211,7 +209,6 @@ switches:
- core
- serv
- c3d2
- radio
- bmx
- priv23
c3d2-server5:

View File

@ -15,7 +15,7 @@ base:
- bird.radv
- bird.ospf
- collectd.gw
'pub-gw or serv-gw or radio-gw':
'pub-gw or serv-gw':
- dhcp
- bird.radv
- bird.ospf

View File

@ -9,7 +9,6 @@ vlans:
pub: 4
# C3D2 home network
c3d2: 5
radio: 6
bmx: 7
# Modems
up1: 10

View File

@ -7,7 +7,7 @@ Machine-readable here: [salt-pillar/subnets](./salt-pillar/subnets/init.sls)
* 172.20.72.128/25
* 172.20.73.0-172.20.73.63/26 SERVERS
* 172.20.73.64/26 RESERVED FOR EXPANDING SERVERS
* 172.20.73.128/26 COLORADIO
* 172.20.73.128/26 UNUSED
* 172.20.73.192/26 PRIV19
* 172.20.74.0/24:
* 172.20.74.0/28 PRIV1