forked from zentralwerk/network
move priv19 to larger subnet
This commit is contained in:
parent
a4422a99d1
commit
44979e6519
|
@ -241,10 +241,11 @@ dhcp:
|
||||||
domain-name: priv18.zentralwerk.org
|
domain-name: priv18.zentralwerk.org
|
||||||
|
|
||||||
priv19:
|
priv19:
|
||||||
start: 172.20.74.82
|
start: 172.20.73.194
|
||||||
end: 172.20.74.94
|
end: 172.20.73.254
|
||||||
time: 120
|
time: 120
|
||||||
max-time: 86400
|
# 30 days
|
||||||
|
max-time: 2592000
|
||||||
opts:
|
opts:
|
||||||
host-opts:
|
host-opts:
|
||||||
routers: priv19-gw.priv19
|
routers: priv19-gw.priv19
|
||||||
|
|
|
@ -113,6 +113,7 @@ hosts-inet:
|
||||||
priv22-gw: 172.20.72.35
|
priv22-gw: 172.20.72.35
|
||||||
priv23-gw: 172.20.72.36
|
priv23-gw: 172.20.72.36
|
||||||
priv24-gw: 172.20.72.37
|
priv24-gw: 172.20.72.37
|
||||||
|
priv25-gw: 172.20.72.32
|
||||||
|
|
||||||
pub:
|
pub:
|
||||||
pub-gw: 172.20.76.1
|
pub-gw: 172.20.76.1
|
||||||
|
@ -219,9 +220,9 @@ hosts-inet:
|
||||||
dhcp{{ i }}: 172.20.74.{{ 49 + i }}
|
dhcp{{ i }}: 172.20.74.{{ 49 + i }}
|
||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
priv19:
|
priv19:
|
||||||
priv19-gw: 172.20.74.81
|
priv19-gw: 172.20.73.193
|
||||||
{%- for i in range(1, 14) %}
|
{%- for i in range(1, 61) %}
|
||||||
dhcp{{ i }}: 172.20.74.{{ 81 + i }}
|
dhcp{{ i }}: 172.20.74.{{ 193 + i }}
|
||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
priv20:
|
priv20:
|
||||||
priv20-gw: 172.20.74.113
|
priv20-gw: 172.20.74.113
|
||||||
|
|
|
@ -2,12 +2,13 @@ subnets-inet:
|
||||||
core: 172.20.72.0/26
|
core: 172.20.72.0/26
|
||||||
serv: 172.20.73.0/26
|
serv: 172.20.73.0/26
|
||||||
pub: 172.20.76.0/22
|
pub: 172.20.76.0/22
|
||||||
|
priv19: 172.20.73.192/26
|
||||||
priv1: 172.20.74.0/28
|
priv1: 172.20.74.0/28
|
||||||
priv17: 172.20.74.16/28
|
priv17: 172.20.74.16/28
|
||||||
priv9: 172.20.74.32/28
|
priv9: 172.20.74.32/28
|
||||||
priv18: 172.20.74.48/28
|
priv18: 172.20.74.48/28
|
||||||
priv5: 172.20.74.64/28
|
priv5: 172.20.74.64/28
|
||||||
priv19: 172.20.74.80/28
|
priv25: 172.20.74.80/28
|
||||||
priv10: 172.20.74.96/28
|
priv10: 172.20.74.96/28
|
||||||
priv20: 172.20.74.112/28
|
priv20: 172.20.74.112/28
|
||||||
priv3: 172.20.74.128/28
|
priv3: 172.20.74.128/28
|
||||||
|
|
|
@ -8,14 +8,14 @@ Machine-readable here: [salt-pillar/subnets](./salt-pillar/subnets/init.sls)
|
||||||
* 172.20.73.0-172.20.73.63/26 SERVERS
|
* 172.20.73.0-172.20.73.63/26 SERVERS
|
||||||
* 172.20.73.64/26 RESERVED FOR EXPANDING SERVERS
|
* 172.20.73.64/26 RESERVED FOR EXPANDING SERVERS
|
||||||
* 172.20.73.128/26 COLORADIO
|
* 172.20.73.128/26 COLORADIO
|
||||||
* 172.20.73.192/26
|
* 172.20.73.192/26 PRIV19
|
||||||
* 172.20.74.0/24:
|
* 172.20.74.0/24:
|
||||||
* 172.20.74.0/28 PRIV1
|
* 172.20.74.0/28 PRIV1
|
||||||
* 172.20.74.16/28 PRIV17
|
* 172.20.74.16/28 PRIV17
|
||||||
* 172.20.74.32/28 PRIV9
|
* 172.20.74.32/28 PRIV9
|
||||||
* 172.20.74.48/28 PRIV18
|
* 172.20.74.48/28 PRIV18
|
||||||
* 172.20.74.64/28 PRIV5
|
* 172.20.74.64/28 PRIV5
|
||||||
* 172.20.74.80/28 PRIV19
|
* 172.20.74.80/28 PRIV25
|
||||||
* 172.20.74.96/28 PRIV10
|
* 172.20.74.96/28 PRIV10
|
||||||
* 172.20.74.112/28 PRIV20
|
* 172.20.74.112/28 PRIV20
|
||||||
* 172.20.74.128/28 PRIV3
|
* 172.20.74.128/28 PRIV3
|
||||||
|
|
Loading…
Reference in New Issue