From 7f47ab0c5c144653ac4043b238c75a687953c836 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Mon, 16 Sep 2019 00:13:29 +0200
Subject: [PATCH] hosts, subnets, radv: add priv25

---
 salt-pillar/bird/radv.sls    |  7 +++++++
 salt-pillar/hosts/init.sls   | 13 ++++++++++++-
 salt-pillar/subnets/init.sls |  2 ++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/salt-pillar/bird/radv.sls b/salt-pillar/bird/radv.sls
index 8de7493..8cf025e 100644
--- a/salt-pillar/bird/radv.sls
+++ b/salt-pillar/bird/radv.sls
@@ -191,3 +191,10 @@ radv:
         - upstream2.core
       dnssl:
         - priv24.zentralwerk.org
+  priv25-gw:
+    priv25:
+      rdnss:
+        - dnscache.serv
+        - upstream1.core
+      dnssl:
+        - priv25.zentralwerk.org
diff --git a/salt-pillar/hosts/init.sls b/salt-pillar/hosts/init.sls
index 9339d5e..2d41f0f 100644
--- a/salt-pillar/hosts/init.sls
+++ b/salt-pillar/hosts/init.sls
@@ -125,7 +125,7 @@ hosts-inet:
     priv22-gw: 172.20.72.35
     priv23-gw: 172.20.72.36
     priv24-gw: 172.20.72.37
-    priv25-gw: 172.20.72.32
+    priv25-gw: 172.20.72.38
 
   pub:
     pub-gw: 172.20.76.1
@@ -269,6 +269,11 @@ hosts-inet:
 {%- for i in range(1, 14) %}
     dhcp{{ i }}: 172.20.74.{{ 241 + i }}
 {%- endfor %}
+  priv25:
+    priv25-gw: 172.20.74.81
+{%- for i in range(1, 14) %}
+    dhcp{{ i }}: 172.20.74.{{ 81 + i }}
+{%- endfor %}
 
   radio:
     radio-gw: 172.20.73.129
@@ -399,6 +404,7 @@ hosts-inet6:
       priv22-gw: fd23:42:c3d2:581::c:15
       priv23-gw: fd23:42:c3d2:581::c:16
       priv24-gw: fd23:42:c3d2:581::c:17
+      priv25-gw: fd23:42:c3d2:581::c:18
 
     serv:
       serv-gw: fd23:42:c3d2:582::1
@@ -457,6 +463,8 @@ hosts-inet6:
       priv23-gw: fd23:42:c3d2:5d6::1
     priv24:
       priv24-gw: fd23:42:c3d2:5d7::1
+    priv25:
+      priv25-gw: fd23:42:c3d2:5d8::1
 
     radio:
       radio-gw: fd23:42:c3d2:586::1
@@ -528,6 +536,7 @@ hosts-inet6:
       priv22-gw: 2a02:8106:211:e981::c:15
       priv23-gw: 2a02:8106:211:e981::c:16
       priv24-gw: 2a02:8106:211:e981::c:17
+      priv25-gw: 2a02:8106:211:e981::c:18
 
     radio:
       radio-gw: 2a02:8106:208:5286::1
@@ -580,3 +589,5 @@ hosts-inet6:
       priv23-gw: 2a02:8106:211:e9d6::1
     priv24:
       priv24-gw: 2a02:8106:211:e9d7::1
+    priv25:
+      priv25-gw: 2a02:8106:211:e9d8::1
diff --git a/salt-pillar/subnets/init.sls b/salt-pillar/subnets/init.sls
index 1633c9f..ba4c6bb 100644
--- a/salt-pillar/subnets/init.sls
+++ b/salt-pillar/subnets/init.sls
@@ -62,6 +62,7 @@ subnets-inet6:
     priv22: fd23:42:c3d2:5d5::/64
     priv23: fd23:42:c3d2:5d6::/64
     priv24: fd23:42:c3d2:5d7::/64
+    priv25: fd23:42:c3d2:5d8::/64
     c3d2: fd23:42:c3d2:523::/64
   up1:
     c3d2: 2a02:8106:208:5201::/64
@@ -95,3 +96,4 @@ subnets-inet6:
     priv22: 2a02:8106:211:e9d5::/64
     priv23: 2a02:8106:211:e9d6::/64
     priv24: 2a02:8106:211:e9d7::/64
+    priv25: 2a02:8106:211:e9d8::/64