From 641db6d07b97167ea17b88a9d19c64aa2a853c3f Mon Sep 17 00:00:00 2001 From: Astro Date: Tue, 26 Jun 2018 20:01:07 +0200 Subject: [PATCH] prepare priv17..24 --- salt-pillar/hosts/init.sls | 124 ++++++++++++++++++++++++++++++++++- salt-pillar/subnets/init.sls | 24 +++++++ salt-pillar/vlans/init.sls | 7 ++ subnets.md | 26 +++++--- 4 files changed, 171 insertions(+), 10 deletions(-) diff --git a/salt-pillar/hosts/init.sls b/salt-pillar/hosts/init.sls index b38b340..de0756a 100644 --- a/salt-pillar/hosts/init.sls +++ b/salt-pillar/hosts/init.sls @@ -73,6 +73,14 @@ hosts-inet: bgp: 172.20.72.27 mgmt-gw: 172.20.72.28 radio-gw: 172.20.72.29 + priv17-gw: 172.20.72.30 + priv18-gw: 172.20.72.31 + priv19-gw: 172.20.72.32 + priv20-gw: 172.20.72.33 + priv21-gw: 172.20.72.34 + priv22-gw: 172.20.72.35 + priv23-gw: 172.20.72.36 + priv24-gw: 172.20.72.37 pub: pub-gw: 172.20.76.1 @@ -95,6 +103,9 @@ hosts-inet: {%- endfor %} priv9: priv9-gw: 172.20.74.33 +{%- for i in range(1, 14) %} + dhcp{{ i }}: 172.20.74.{{ 33 + i }} +{%- endfor %} priv5: priv5-gw: 172.20.74.65 {%- for i in range(1, 14) %} @@ -102,6 +113,9 @@ hosts-inet: {%- endfor %} priv10: priv10-gw: 172.20.74.97 +{%- for i in range(1, 14) %} + dhcp{{ i }}: 172.20.74.{{ 97 + i }} +{%- endfor %} priv3: priv3-gw: 172.20.74.129 {%- for i in range(1, 14) %} @@ -109,6 +123,9 @@ hosts-inet: {%- endfor %} priv11: priv11-gw: 172.20.74.161 +{%- for i in range(1, 14) %} + dhcp{{ i }}: 172.20.74.{{ 161 + i }} +{%- endfor %} priv6: priv6-gw: 172.20.74.193 {%- for i in range(1, 14) %} @@ -116,6 +133,9 @@ hosts-inet: {%- endfor %} priv12: priv12-gw: 172.20.74.225 +{%- for i in range(1, 14) %} + dhcp{{ i }}: 172.20.74.{{ 225 + i }} +{%- endfor %} priv2: priv2-gw: 172.20.75.1 {%- for i in range(1, 31) %} @@ -123,6 +143,9 @@ hosts-inet: {%- endfor %} priv13: priv13-gw: 172.20.75.33 +{%- for i in range(1, 14) %} + dhcp{{ i }}: 172.20.75.{{ 33 + i }} +{%- endfor %} priv7: priv7-gw: 172.20.75.65 {%- for i in range(1, 14) %} @@ -130,6 +153,9 @@ hosts-inet: {%- endfor %} priv14: priv14-gw: 172.20.75.97 +{%- for i in range(1, 14) %} + dhcp{{ i }}: 172.20.75.{{ 97 + i }} +{%- endfor %} priv4: priv4-gw: 172.20.75.129 {%- for i in range(1, 14) %} @@ -137,6 +163,9 @@ hosts-inet: {%- endfor %} priv15: priv15-gw: 172.20.75.161 +{%- for i in range(1, 14) %} + dhcp{{ i }}: 172.20.75.{{ 161 + i }} +{%- endfor %} priv8: priv8-gw: 172.20.75.193 {%- for i in range(1, 14) %} @@ -144,6 +173,49 @@ hosts-inet: {%- endfor %} priv16: priv16-gw: 172.20.75.225 +{%- for i in range(1, 14) %} + 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 }} +{%- endfor %} + priv18: + priv18-gw: 172.20.74.49 +{%- for i in range(1, 14) %} + dhcp{{ i }}: 172.20.74.{{ 49 + i }} +{%- endfor %} + priv19: + priv19-gw: 172.20.74.81 +{%- for i in range(1, 14) %} + dhcp{{ i }}: 172.20.74.{{ 81 + i }} +{%- endfor %} + priv20: + priv20-gw: 172.20.74.113 +{%- for i in range(1, 14) %} + dhcp{{ i }}: 172.20.74.{{ 113 + i }} +{%- endfor %} + priv21: + priv21-gw: 172.20.74.145 +{%- for i in range(1, 14) %} + dhcp{{ i }}: 172.20.74.{{ 145 + i }} +{%- endfor %} + priv22: + priv22-gw: 172.20.74.177 +{%- for i in range(1, 14) %} + 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 }} +{%- endfor %} + priv24: + priv24-gw: 172.20.74.241 +{%- for i in range(1, 14) %} + dhcp{{ i }}: 172.20.74.{{ 241 + i }} +{%- endfor %} radio: radio-gw: 172.20.73.129 @@ -230,7 +302,15 @@ hosts-inet6: priv13-gw: fd23:42:c3d2:581::c:c priv14-gw: fd23:42:c3d2:581::c:d priv15-gw: fd23:42:c3d2:581::c:e - priv16-gw: fd23:42:c3d2:581::c:d + priv16-gw: fd23:42:c3d2:581::c:f + priv17-gw: fd23:42:c3d2:581::c:10 + priv18-gw: fd23:42:c3d2:581::c:11 + priv19-gw: fd23:42:c3d2:581::c:12 + priv20-gw: fd23:42:c3d2:581::c:13 + priv21-gw: fd23:42:c3d2:581::c:14 + priv22-gw: fd23:42:c3d2:581::c:15 + priv23-gw: fd23:42:c3d2:581::c:16 + priv24-gw: fd23:42:c3d2:581::c:17 serv: serv-gw: fd23:42:c3d2:582::1 @@ -272,6 +352,22 @@ hosts-inet6: priv15-gw: fd23:42:c3d2:5ce::1 priv16: priv16-gw: fd23:42:c3d2:5cf::1 + priv17: + priv17-gw: fd23:42:c3d2:5d0::1 + priv18: + priv18-gw: fd23:42:c3d2:5d1::1 + priv19: + priv19-gw: fd23:42:c3d2:5d2::1 + priv20: + priv20-gw: fd23:42:c3d2:5d3::1 + priv21: + priv21-gw: fd23:42:c3d2:5d4::1 + priv22: + priv22-gw: fd23:42:c3d2:5d5::1 + priv23: + priv23-gw: fd23:42:c3d2:5d6::1 + priv24: + priv24-gw: fd23:42:c3d2:5d7::1 radio: radio-gw: fd23:42:c3d2:586::1 @@ -314,7 +410,15 @@ hosts-inet6: priv13-gw: 2a02:8106:208:5281::c:c priv14-gw: 2a02:8106:208:5281::c:d priv15-gw: 2a02:8106:208:5281::c:e - priv16-gw: 2a02:8106:208:5281::c:d + priv16-gw: 2a02:8106:208:5281::c:f + priv17-gw: 2a02:8106:208:5281::c:10 + priv18-gw: 2a02:8106:208:5281::c:11 + priv19-gw: 2a02:8106:208:5281::c:12 + priv20-gw: 2a02:8106:208:5281::c:13 + priv21-gw: 2a02:8106:208:5281::c:14 + priv22-gw: 2a02:8106:208:5281::c:15 + priv23-gw: 2a02:8106:208:5281::c:16 + priv24-gw: 2a02:8106:208:5281::c:17 serv: serv-gw: 2a02:8106:208:5282::1 @@ -356,6 +460,22 @@ hosts-inet6: priv15-gw: 2a02:8106:208:52ce::1 priv16: priv16-gw: 2a02:8106:208:52cf::1 + priv17: + priv17-gw: 2a02:8106:208:52d0::1 + priv18: + priv18-gw: 2a02:8106:208:52d1::1 + priv19: + priv19-gw: 2a02:8106:208:52d2::1 + priv20: + priv20-gw: 2a02:8106:208:52d3::1 + priv21: + priv21-gw: 2a02:8106:208:52d4::1 + priv22: + priv22-gw: 2a02:8106:208:52d5::1 + priv23: + priv23-gw: 2a02:8106:208:52d6::1 + priv24: + priv24-gw: 2a02:8106:208:52d7::1 radio: radio-gw: 2a02:8106:208:5286::1 diff --git a/salt-pillar/subnets/init.sls b/salt-pillar/subnets/init.sls index a7447d2..9c18d63 100644 --- a/salt-pillar/subnets/init.sls +++ b/salt-pillar/subnets/init.sls @@ -3,13 +3,21 @@ subnets-inet: serv: 172.20.73.0/26 pub: 172.20.76.0/23 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 + priv19: 172.20.74.80/28 priv10: 172.20.74.96/28 + priv20: 172.20.74.112/28 priv3: 172.20.74.128/28 + priv21: 172.20.74.144/28 priv11: 172.20.74.160/28 + priv22: 172.20.74.176/28 priv6: 172.20.74.192/28 + priv23: 172.20.74.208/28 priv12: 172.20.74.224/28 + priv24: 172.20.74.240/28 priv2: 172.20.75.0/27 priv13: 172.20.75.32/28 priv7: 172.20.75.64/28 @@ -45,6 +53,14 @@ subnets-inet6: priv14: fd23:42:c3d2:5cd::/64 priv15: fd23:42:c3d2:5ce::/64 priv16: fd23:42:c3d2:5cf::/64 + priv17: fd23:42:c3d2:5d0::/64 + priv18: fd23:42:c3d2:5d1::/64 + priv19: fd23:42:c3d2:5d2::/64 + priv20: fd23:42:c3d2:5d3::/64 + priv21: fd23:42:c3d2:5d4::/64 + priv22: fd23:42:c3d2:5d5::/64 + priv23: fd23:42:c3d2:5d6::/64 + priv24: fd23:42:c3d2:5d7::/64 c3d2: fd23:42:c3d2:523::/64 up1: c3d2: 2a02:8106:208:5201::/64 @@ -68,3 +84,11 @@ subnets-inet6: priv14: 2a02:8106:208:52cd::/64 priv15: 2a02:8106:208:52ce::/64 priv16: 2a02:8106:208:52cf::/64 + priv17: 2a02:8106:208:52d0::/64 + priv18: 2a02:8106:208:52d1::/64 + priv19: 2a02:8106:208:52d2::/64 + priv20: 2a02:8106:208:52d3::/64 + priv21: 2a02:8106:208:52d4::/64 + priv22: 2a02:8106:208:52d5::/64 + priv23: 2a02:8106:208:52d6::/64 + priv24: 2a02:8106:208:52d7::/64 diff --git a/salt-pillar/vlans/init.sls b/salt-pillar/vlans/init.sls index 9769571..cfe985b 100644 --- a/salt-pillar/vlans/init.sls +++ b/salt-pillar/vlans/init.sls @@ -37,6 +37,13 @@ vlans: priv15: 54 priv16: 55 priv17: 56 + priv18: 57 + priv19: 58 + priv20: 59 + priv21: 60 + priv22: 61 + priv23: 62 + priv24: 63 # Isolated neighbors directly connection with their modems iso1: 101 iso2: 102 diff --git a/subnets.md b/subnets.md index 2f8763a..3e6c8b0 100644 --- a/subnets.md +++ b/subnets.md @@ -10,14 +10,22 @@ Machine-readable here: [salt-pillar/subnets](./salt-pillar/subnets/init.sls) * 172.20.73.128/26 COLORADIO * 172.20.73.192/26 * 172.20.74.0/24: - * 172.20.74.0-172.20.74.15/28 PRIV1 - * 172.20.74.32-172.20.74.47/28 PRIV9 - * 172.20.74.64-172.20.74.79/28 PRIV5 - * 172.20.74.96-172.20.74.111/28 PRIV10 - * 172.20.74.128-172.20.74.143/28 PRIV3 - * 172.20.74.160-172.20.74.175/28 PRIV11 - * 172.20.74.192-172.20.74.207/28 PRIV6 - * 172.20.74.224-172.20.74.239/28 PRIV12 + * 172.20.74.0/28 PRIV1 + * 172.20.74.16/28 PRIV17 + * 172.20.74.32/28 PRIV9 + * 172.20.74.48/28 PRIV18 + * 172.20.74.64/28 PRIV5 + * 172.20.74.80/28 PRIV19 + * 172.20.74.96/28 PRIV10 + * 172.20.74.112/28 PRIV20 + * 172.20.74.128/28 PRIV3 + * 172.20.74.144/28 PRIV21 + * 172.20.74.160/28 PRIV11 + * 172.20.74.176/28 PRIV22 + * 172.20.74.192/28 PRIV6 + * 172.20.74.208/28 PRIV23 + * 172.20.74.224/28 PRIV12 + * 172.20.74.240/28 PRIV24 * 172.20.75.0/24 * 172.20.75.0-172.20.75.31/27 PRIV2 * 172.20.75.32-172.20.75.47/28 PRIV13 @@ -58,6 +66,7 @@ Machine-readable here: [salt-pillar/subnets](./salt-pillar/subnets/init.sls) * fd23:42:c3d2:5cd::/64 PRIV14 * fd23:42:c3d2:5ce::/64 PRIV15 * fd23:42:c3d2:5cf::/64 PRIV16 +* […] PRIV24 ## Tunnelbroker.net @@ -95,3 +104,4 @@ Machine-readable here: [salt-pillar/subnets](./salt-pillar/subnets/init.sls) * 2a02:8106:208:52cd::/64 PRIV14 * 2a02:8106:208:52ce::/64 PRIV15 * 2a02:8106:208:52cf::/64 PRIV16 + * […] PRIV24