forked from zentralwerk/network
priv42: deploy
This commit is contained in:
parent
20ca7bcef6
commit
d3b6ca95e5
|
@ -570,6 +570,21 @@ cpe:
|
|||
5Sz+m/21
|
||||
=tbb+
|
||||
-----END PGP MESSAGE-----
|
||||
'paperheart':
|
||||
net: priv42
|
||||
psk: |
|
||||
-----BEGIN PGP MESSAGE-----
|
||||
|
||||
hQEMA2PKcvDMvlKLAQgAmDdbxp2eNDQY0AXYJq0p4ydry+9O7Vycj/jndDgEKvrs
|
||||
AOZQOyzJdVuzbFMIp9uCsXCbsYkfwgaGhnW9Lq9Yl/nheCbHYeDvCIOWwvE5d7Z0
|
||||
O/vte6qQ4zPW04IRhmLFGTKq+NKuoV0kqWIgGdC5uDefCSnoDIgVMwyeVHMwVd2c
|
||||
UoxIqodWihTOxFLUKUd84JkeWexU7OsnIK4XI5Gee+K+YeHHwr1JEf6Chq+fnFub
|
||||
C53ygOJ79GdRojt5LQwzU3/XJu6Qu222go4z6cWVefK1mjC3HvXCun93mMDMy0WH
|
||||
eZTGG3WxNmAj1ye3xKrmw0uJD9ND6Lj4e/3HUfzv2tJJATv7BRs+3rPt47MwuQO0
|
||||
kULonn9irtFhadSqd/upDltomxsWJd59EJo+wh+YEPBt15cHeQUTPU51O7v2xONo
|
||||
wDAzMBlsuApe1g==
|
||||
=SB6m
|
||||
-----END PGP MESSAGE-----
|
||||
|
||||
ap13:
|
||||
password: |
|
||||
|
|
|
@ -511,3 +511,15 @@ dhcp:
|
|||
routers: priv41-gw.priv41
|
||||
string-opts:
|
||||
domain-name: priv41.zentralwerk.dn42
|
||||
|
||||
priv42:
|
||||
start: 172.20.76.34
|
||||
end: 172.20.76.62
|
||||
time: 120
|
||||
max-time: 86400
|
||||
opts:
|
||||
domain-name-servers: "172.20.73.8, 9.9.9.9"
|
||||
host-opts:
|
||||
routers: priv42-gw.priv42
|
||||
string-opts:
|
||||
domain-name: priv42.zentralwerk.dn42
|
||||
|
|
|
@ -160,6 +160,7 @@ hosts-inet:
|
|||
c3d2-gw3: 172.20.72.64
|
||||
priv41-gw: 172.20.72.65
|
||||
priv17-gw-up3: 172.20.72.66
|
||||
priv42-gw: 172.20.72.66
|
||||
|
||||
pub:
|
||||
pub-gw: 172.20.78.1
|
||||
|
@ -304,6 +305,8 @@ hosts-inet:
|
|||
priv40-gw: 172.20.77.65
|
||||
priv41:
|
||||
priv41-gw: 172.20.77.193
|
||||
priv42:
|
||||
priv42-gw: 172.20.76.33
|
||||
|
||||
cluster:
|
||||
cls-gw: 172.20.77.1
|
||||
|
@ -459,6 +462,7 @@ hosts-inet6:
|
|||
priv39-gw: fd23:42:c3d2:581::c:26
|
||||
priv40-gw: fd23:42:c3d2:581::c:27
|
||||
priv41-gw: fd23:42:c3d2:581::c:28
|
||||
priv42-gw: fd23:42:c3d2:581::c:29
|
||||
|
||||
freifunk: fd23:42:c3d2:581:8000::1
|
||||
yggdrasil: fd23:42:c3d2:581:9000::1
|
||||
|
@ -559,6 +563,8 @@ hosts-inet6:
|
|||
priv40-gw: fd23:42:c3d2:5e7::1
|
||||
priv41:
|
||||
priv41-gw: fd23:42:c3d2:5e8::1
|
||||
priv42:
|
||||
priv42-gw: fd23:42:c3d2:5e9::1
|
||||
|
||||
cluster:
|
||||
cls-gw: fd23:42:c3d2:586::1
|
||||
|
@ -630,6 +636,7 @@ hosts-inet6:
|
|||
priv39-gw: 2a00:8180:2c00:281::c:26
|
||||
priv40-gw: 2a00:8180:2c00:281::c:27
|
||||
priv41-gw: 2a00:8180:2c00:281::c:28
|
||||
priv42-gw: 2a00:8180:2c00:281::c:29
|
||||
|
||||
freifunk: 2a00:8180:2c00:281:8000::1
|
||||
yggdrasil: 2a00:8180:2c00:281:9000::1
|
||||
|
@ -747,3 +754,5 @@ hosts-inet6:
|
|||
priv40-gw: 2a00:8180:2c00:2e6::1
|
||||
priv41:
|
||||
priv41-gw: 2a00:8180:2c00:2e7::1
|
||||
priv42:
|
||||
priv42-gw: 2a00:8180:2c00:2e8::1
|
||||
|
|
|
@ -490,6 +490,15 @@ containers:
|
|||
type: phys
|
||||
hwaddr: 0A:14:48:01:2A:4F
|
||||
|
||||
priv42-gw:
|
||||
interfaces:
|
||||
core:
|
||||
type: veth
|
||||
hwaddr: 0A:14:48:01:2A:50
|
||||
priv42:
|
||||
type: phys
|
||||
hwaddr: 0A:14:48:01:2A:51
|
||||
|
||||
upstream1:
|
||||
interfaces:
|
||||
core:
|
||||
|
|
|
@ -42,6 +42,7 @@ subnets-inet:
|
|||
priv39: 172.20.77.128/28
|
||||
priv40: 172.20.77.64/28
|
||||
priv41: 172.20.77.192/28
|
||||
priv42: 172.20.76.32/28
|
||||
c3d2: 172.22.99.0/24
|
||||
mgmt: 10.0.0.0/24
|
||||
priv17: 172.20.73.128/27
|
||||
|
@ -95,6 +96,7 @@ subnets-inet6:
|
|||
priv39: fd23:42:c3d2:5e6::/64
|
||||
priv40: fd23:42:c3d2:5e7::/64
|
||||
priv41: fd23:42:c3d2:5e8::/64
|
||||
priv42: fd23:42:c3d2:5e9::/64
|
||||
c3d2: fd23:42:c3d2:523::/64
|
||||
up4:
|
||||
c3d2: 2a00:8180:2c00:223::/64
|
||||
|
@ -142,3 +144,4 @@ subnets-inet6:
|
|||
priv39: 2a00:8180:2c00:2e6::/64
|
||||
priv40: 2a00:8180:2c00:2e7::/64
|
||||
priv41: 2a00:8180:2c00:2e8::/64
|
||||
priv42: 2a00:8180:2c00:2e9::/64
|
||||
|
|
|
@ -145,6 +145,7 @@ switches:
|
|||
- priv21
|
||||
- priv38
|
||||
- priv40
|
||||
- priv42
|
||||
server1:
|
||||
mode: trunk
|
||||
ports:
|
||||
|
@ -208,6 +209,7 @@ switches:
|
|||
- priv39
|
||||
- priv40
|
||||
- priv41
|
||||
- priv42
|
||||
server2:
|
||||
mode: bond
|
||||
group: 1
|
||||
|
@ -737,6 +739,7 @@ switches:
|
|||
- priv21
|
||||
- priv38
|
||||
- priv40
|
||||
- priv42
|
||||
ap9:
|
||||
mode: trunk
|
||||
ports: 5
|
||||
|
@ -773,6 +776,7 @@ switches:
|
|||
- mgmt
|
||||
- pub
|
||||
- priv38
|
||||
- priv42
|
||||
ap3:
|
||||
mode: trunk
|
||||
ports: 3
|
||||
|
|
|
@ -44,6 +44,7 @@ Machine-readable here: [salt-pillar/subnets](./salt-pillar/subnets/init.sls)
|
|||
* 172.20.75.240-172.20.75.255/28 PRIV32
|
||||
* 172.20.76.0-172.20.76.255/24
|
||||
* 172.20.76.0-172.20.76.31/28 PRIV35
|
||||
* 172.20.76.32-172.20.77.63/28 PRIV42
|
||||
* 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
|
||||
|
|
Loading…
Reference in New Issue