diff --git a/salt-pillar/dhcp/init.sls b/salt-pillar/dhcp/init.sls index 12ae8b6..7697f8b 100644 --- a/salt-pillar/dhcp/init.sls +++ b/salt-pillar/dhcp/init.sls @@ -220,8 +220,8 @@ dhcp: domain-name: priv16.zentralwerk.org priv17: - start: 172.20.74.18 - end: 172.20.74.30 + start: 172.20.73.130 + end: 172.20.73.158 time: 120 max-time: 86400 opts: diff --git a/salt-pillar/hosts/init.sls b/salt-pillar/hosts/init.sls index bf50f07..be3001f 100644 --- a/salt-pillar/hosts/init.sls +++ b/salt-pillar/hosts/init.sls @@ -249,7 +249,7 @@ hosts-inet: {%- endfor %} priv2: 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 }} {%- endfor %} priv13: @@ -288,9 +288,9 @@ hosts-inet: dhcp{{ i }}: 172.20.75.{{ 225 + i }} {%- endfor %} priv17: - priv17-gw: 172.20.74.17 -{%- for i in range(1, 14) %} - dhcp{{ i }}: 172.20.74.{{ 17 + i }} + priv17-gw: 172.20.73.129 +{%- for i in range(1, 30) %} + dhcp{{ i }}: 172.20.73.{{ 129 + i }} {%- endfor %} priv18: priv18-gw: 172.20.74.49 diff --git a/salt-pillar/subnets/init.sls b/salt-pillar/subnets/init.sls index b61e855..06612fc 100644 --- a/salt-pillar/subnets/init.sls +++ b/salt-pillar/subnets/init.sls @@ -4,7 +4,6 @@ subnets-inet: pub: 172.20.76.0/22 priv19: 172.20.73.192/26 priv1: 172.20.74.0/28 - priv17: 172.20.74.16/28 priv9: 172.20.74.32/28 priv18: 172.20.74.48/28 priv5: 172.20.74.64/28 @@ -36,6 +35,7 @@ subnets-inet: priv32: 172.20.75.240/28 c3d2: 172.22.99.0/24 mgmt: 10.0.0.0/24 + priv17: 172.20.73.128/27 subnets-inet6: dn42: diff --git a/subnets.md b/subnets.md index 61c87e8..35bccc6 100644 --- a/subnets.md +++ b/subnets.md @@ -7,11 +7,12 @@ 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 UNUSED +* 172.20.73.128/27 PRIV17 +* 172.20.73.160/27 UNUSED * 172.20.73.192/26 PRIV19 * 172.20.74.0/24: * 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.48/28 PRIV18 * 172.20.74.64/28 PRIV5