diff --git a/salt-pillar/dhcp/init.sls b/salt-pillar/dhcp/init.sls index 30b2d2d..5c74983 100644 --- a/salt-pillar/dhcp/init.sls +++ b/salt-pillar/dhcp/init.sls @@ -12,7 +12,7 @@ dhcp: domain-name: serv.zentralwerk.org pub: - start: 172.20.76.2 + start: 172.20.78.2 end: 172.20.79.254 time: 300 max-time: 3600 diff --git a/salt-pillar/hosts/init.sls b/salt-pillar/hosts/init.sls index 94b5b57..655c414 100644 --- a/salt-pillar/hosts/init.sls +++ b/salt-pillar/hosts/init.sls @@ -152,12 +152,12 @@ hosts-inet: priv34-gw: 172.20.72.48 pub: - pub-gw: 172.20.76.1 + pub-gw: 172.20.78.1 {%- for i in range(2, 256) %} - guest{{ i }}: 172.20.76.{{ i }} + guest{{ i }}: 172.20.78.{{ i }} {%- endfor %} {%- for i in range(0, 255) %} - guest{{ 256 + i }}: 172.20.77.{{ i }} + guest{{ 256 + i }}: 172.20.79.{{ i }} {%- endfor %} serv: serv-gw: 172.20.73.1 diff --git a/salt-pillar/subnets/init.sls b/salt-pillar/subnets/init.sls index a8cf968..7cfecd2 100644 --- a/salt-pillar/subnets/init.sls +++ b/salt-pillar/subnets/init.sls @@ -1,7 +1,7 @@ subnets-inet: core: 172.20.72.0/26 serv: 172.20.73.0/26 - pub: 172.20.76.0/22 + pub: 172.20.78.0/23 priv19: 172.20.73.192/26 priv1: 172.20.74.0/28 priv33: 172.20.74.16/28 diff --git a/subnets.md b/subnets.md index bc6dfe0..134e0f5 100644 --- a/subnets.md +++ b/subnets.md @@ -43,7 +43,8 @@ Machine-readable here: [salt-pillar/subnets](./salt-pillar/subnets/init.sls) * 172.20.75.208-172.20.75.223/28 PRIV31 * 172.20.75.224-172.20.75.239/28 PRIV16 * 172.20.75.240-172.20.75.255/28 PRIV32 -* 172.20.76.0-172.20.79.255/22 PUBLIC +* 172.20.76.0-172.20.77.255/23 RESERVED +* 172.20.78.0-172.20.79.255/23 PUBLIC ## RFC 1918: non-routed