From 27c6cd1d568613b14f5cb603ccd20b49e2c6c9fe Mon Sep 17 00:00:00 2001 From: Astro Date: Wed, 10 Feb 2021 18:00:36 +0100 Subject: [PATCH] priv23: renumber --- salt-pillar/dhcp/init.sls | 4 ++-- salt-pillar/hosts/init.sls | 6 +++--- salt-pillar/subnets/init.sls | 2 +- subnets.md | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/salt-pillar/dhcp/init.sls b/salt-pillar/dhcp/init.sls index 167810c..b044399 100644 --- a/salt-pillar/dhcp/init.sls +++ b/salt-pillar/dhcp/init.sls @@ -293,8 +293,8 @@ dhcp: domain-name: priv22.zentralwerk.org priv23: - start: 172.20.74.210 - end: 172.20.74.222 + start: 172.20.73.162 + end: 172.20.73.190 time: 120 max-time: 86400 opts: diff --git a/salt-pillar/hosts/init.sls b/salt-pillar/hosts/init.sls index ac0dbea..49b0786 100644 --- a/salt-pillar/hosts/init.sls +++ b/salt-pillar/hosts/init.sls @@ -319,9 +319,9 @@ hosts-inet: dhcp{{ i }}: 172.20.74.{{ 177 + i }} {%- endfor %} priv23: - priv23-gw: 172.20.74.209 -{%- for i in range(1, 14) %} - dhcp{{ i }}: 172.20.74.{{ 209 + i }} + priv23-gw: 172.20.73.161 +{%- for i in range(1, 30) %} + dhcp{{ i }}: 172.20.73.{{ 161 + i }} {%- endfor %} priv24: priv24-gw: 172.20.74.241 diff --git a/salt-pillar/subnets/init.sls b/salt-pillar/subnets/init.sls index 2b74e1c..01dbc9d 100644 --- a/salt-pillar/subnets/init.sls +++ b/salt-pillar/subnets/init.sls @@ -16,7 +16,7 @@ subnets-inet: priv11: 172.20.74.160/28 priv22: 172.20.74.176/28 priv6: 172.20.74.192/28 - priv23: 172.20.74.208/28 + priv23: 172.20.73.160/27 priv12: 172.20.74.224/28 priv24: 172.20.74.240/28 priv2: 172.20.75.0/27 diff --git a/subnets.md b/subnets.md index e8011e5..dbf05e3 100644 --- a/subnets.md +++ b/subnets.md @@ -8,7 +8,7 @@ Machine-readable here: [salt-pillar/subnets](./salt-pillar/subnets/init.sls) * 172.20.73.0-172.20.73.63/26 SERVERS * 172.20.73.64/26 RESERVED FOR EXPANDING SERVERS * 172.20.73.128/27 PRIV17 -* 172.20.73.160/27 UNUSED +* 172.20.73.160/27 PRIV23 * 172.20.73.192/26 PRIV19 * 172.20.74.0/24: * 172.20.74.0/28 PRIV1