zentralwerk/network
zentralwerk
/
network
12
4
Fork 2
Code Issues 3 Pull Requests 1 Releases Wiki Activity

priv17: renumber

This commit is contained in:
Astro 2021-02-08 17:00:39 +01:00
parent e25f3eabaa
commit dcfd9b3c27
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt-pillar/dhcp/init.sls
View File

@ -220,8 +220,8 @@ dhcp:
domain-name: priv16.zentralwerk.org domain-name: priv16.zentralwerk.org
priv17: priv17:
start: 172.20.74.18 start: 172.20.73.130
end: 172.20.74.30 end: 172.20.73.158
time: 120 time: 120
max-time: 86400 max-time: 86400
opts: opts:

8
salt-pillar/hosts/init.sls
View File

@ -249,7 +249,7 @@ hosts-inet:
{%- endfor %} {%- endfor %}
priv2: priv2:
priv2-gw: 172.20.75.1 priv2-gw: 172.20.75.1
{%- for i in range(1, 31) %} {%- for i in range(1, 30) %}
dhcp{{ i }}: 172.20.75.{{ 1 + i }} dhcp{{ i }}: 172.20.75.{{ 1 + i }}
{%- endfor %} {%- endfor %}
priv13: priv13:
@ -288,9 +288,9 @@ hosts-inet:
dhcp{{ i }}: 172.20.75.{{ 225 + i }} dhcp{{ i }}: 172.20.75.{{ 225 + i }}
{%- endfor %} {%- endfor %}
priv17: priv17:
priv17-gw: 172.20.74.17 priv17-gw: 172.20.73.129
{%- for i in range(1, 14) %} {%- for i in range(1, 30) %}
dhcp{{ i }}: 172.20.74.{{ 17 + i }} dhcp{{ i }}: 172.20.73.{{ 129 + i }}
{%- endfor %} {%- endfor %}
priv18: priv18:
priv18-gw: 172.20.74.49 priv18-gw: 172.20.74.49

2
salt-pillar/subnets/init.sls
View File

@ -4,7 +4,6 @@ subnets-inet:
pub: 172.20.76.0/22 pub: 172.20.76.0/22
priv19: 172.20.73.192/26 priv19: 172.20.73.192/26
priv1: 172.20.74.0/28 priv1: 172.20.74.0/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
@ -36,6 +35,7 @@ subnets-inet:
priv32: 172.20.75.240/28 priv32: 172.20.75.240/28
c3d2: 172.22.99.0/24 c3d2: 172.22.99.0/24
mgmt: 10.0.0.0/24 mgmt: 10.0.0.0/24
priv17: 172.20.73.128/27
subnets-inet6: subnets-inet6:
dn42: dn42:

5
subnets.md
View File

@ -7,11 +7,12 @@ Machine-readable here: [salt-pillar/subnets](./salt-pillar/subnets/init.sls)
* 172.20.72.128/25 * 172.20.72.128/25
* 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 UNUSED * 172.20.73.128/27 PRIV17
* 172.20.73.160/27 UNUSED
* 172.20.73.192/26 PRIV19 * 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 UNUSED
* 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