Merge branch 'master' of github.com:zentralwerk/network

salt-pillar/bird/radv.sls

@@ -2,162 +2,192 @@ radv:
   pub-gw:
     pub:
       rdnss:
+        - dnscache.serv
         - upstream1.core
+        - upstream2.core
       dnssl:
         - pub.zentralwerk.org
   serv-gw:
     serv:
       rdnss:
+        - dnscache.serv
         - upstream1.core
+        - upstream2.core
       dnssl:
         - serv.zentralwerk.org
   c3d2-gw:
     c3d2:
       rdnss:
+        - dnscache.serv
         - upstream1.core
+        - upstream2.core
       dnssl:
         - hq.c3d2.de
   priv1-gw:
     priv1:
       rdnss:
+        - dnscache.serv
         - upstream2.core
       dnssl:
         - priv1.zentralwerk.org
   priv2-gw:
     priv2:
       rdnss:
+        - dnscache.serv
         - upstream2.core
       dnssl:
         - priv2.zentralwerk.org
   priv3-gw:
     priv3:
       rdnss:
+        - dnscache.serv
         - upstream2.core
       dnssl:
         - priv3.zentralwerk.org
   priv4-gw:
     priv4:
       rdnss:
+        - dnscache.serv
         - upstream2.core
       dnssl:
         - priv4.zentralwerk.org
   priv5-gw:
     priv5:
       rdnss:
+        - dnscache.serv
         - upstream2.core
       dnssl:
         - priv5.zentralwerk.org
   priv6-gw:
     priv6:
       rdnss:
+        - dnscache.serv
         - upstream2.core
       dnssl:
         - priv6.zentralwerk.org
   priv7-gw:
     priv7:
       rdnss:
+        - dnscache.serv
         - upstream2.core
       dnssl:
         - priv7.zentralwerk.org
   priv8-gw:
     priv8:
       rdnss:
+        - dnscache.serv
         - upstream2.core
       dnssl:
         - priv8.zentralwerk.org
   priv9-gw:
     priv9:
       rdnss:
+        - dnscache.serv
         - upstream2.core
       dnssl:
         - priv9.zentralwerk.org
   priv10-gw:
     priv10:
       rdnss:
+        - dnscache.serv
         - upstream2.core
       dnssl:
         - priv10.zentralwerk.org
   priv11-gw:
     priv11:
       rdnss:
+        - dnscache.serv
         - upstream2.core
       dnssl:
         - priv11.zentralwerk.org
   priv12-gw:
     priv12:
       rdnss:
+        - dnscache.serv
         - upstream2.core
       dnssl:
         - priv12.zentralwerk.org
   priv13-gw:
     priv13:
       rdnss:
+        - dnscache.serv
         - upstream2.core
       dnssl:
         - priv13.zentralwerk.org
   priv14-gw:
     priv14:
       rdnss:
+        - dnscache.serv
         - upstream2.core
       dnssl:
         - priv14.zentralwerk.org
   priv15-gw:
     priv15:
       rdnss:
+        - dnscache.serv
         - upstream2.core
       dnssl:
         - priv15.zentralwerk.org
   priv16-gw:
     priv16:
       rdnss:
+        - dnscache.serv
         - upstream2.core
       dnssl:
         - priv16.zentralwerk.org
   priv17-gw:
     priv17:
       rdnss:
+        - dnscache.serv
         - upstream2.core
       dnssl:
         - priv17.zentralwerk.org
   priv18-gw:
     priv18:
       rdnss:
+        - dnscache.serv
         - upstream2.core
       dnssl:
         - priv18.zentralwerk.org
   priv19-gw:
     priv19:
       rdnss:
+        - dnscache.serv
         - upstream2.core
       dnssl:
         - priv19.zentralwerk.org
   priv20-gw:
     priv20:
       rdnss:
+        - dnscache.serv
         - upstream2.core
       dnssl:
         - priv20.zentralwerk.org
   priv21-gw:
     priv21:
       rdnss:
+        - dnscache.serv
         - upstream2.core
       dnssl:
         - priv21.zentralwerk.org
   priv22-gw:
     priv22:
       rdnss:
+        - dnscache.serv
         - upstream2.core
       dnssl:
         - priv22.zentralwerk.org
   priv23-gw:
     priv23:
       rdnss:
+        - dnscache.serv
         - upstream2.core
       dnssl:
         - priv23.zentralwerk.org
   priv24-gw:
     priv24:
       rdnss:
+        - dnscache.serv
         - upstream2.core
       dnssl:
         - priv24.zentralwerk.org

salt-pillar/dhcp/init.sls

@@ -5,9 +5,9 @@ dhcp:
     time: 300
     max-time: 31536000
     opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
     host-opts:
       routers: serv-gw.serv
-      domain-name-servers: upstream1.core
     string-opts:
       domain-name: serv.zentralwerk.org
 
@@ -18,9 +18,9 @@ dhcp:
     max-time: 3600
     lower-max-time: 50
     opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
     host-opts:
       routers: pub-gw.pub
-      domain-name-servers: upstream1.core
     string-opts:
       domain-name: pub.zentralwerk.org
 
@@ -30,9 +30,9 @@ dhcp:
     time: 120
     max-time: 86400
     opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
     host-opts:
       routers: priv1-gw.priv1
-      domain-name-servers: upstream2.core
     string-opts:
       domain-name: priv1.zentralwerk.org
 
@@ -42,9 +42,9 @@ dhcp:
     time: 120
     max-time: 86400
     opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
     host-opts:
       routers: priv2-gw.priv2
-      domain-name-servers: upstream2.core
     string-opts:
       domain-name: priv2.zentralwerk.org
 
@@ -54,9 +54,9 @@ dhcp:
     time: 120
     max-time: 86400
     opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
     host-opts:
       routers: priv3-gw.priv3
-      domain-name-servers: upstream2.core
     string-opts:
       domain-name: priv3.zentralwerk.org
 
@@ -66,9 +66,9 @@ dhcp:
     time: 120
     max-time: 86400
     opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
     host-opts:
       routers: priv4-gw.priv4
-      domain-name-servers: upstream2.core
     string-opts:
       domain-name: priv4.zentralwerk.org
 
@@ -78,9 +78,9 @@ dhcp:
     time: 120
     max-time: 86400
     opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
     host-opts:
       routers: priv5-gw.priv5
-      domain-name-servers: upstream2.core
     string-opts:
       domain-name: priv5.zentralwerk.org
 
@@ -90,9 +90,9 @@ dhcp:
     time: 120
     max-time: 86400
     opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
     host-opts:
       routers: priv6-gw.priv6
-      domain-name-servers: upstream2.core
     string-opts:
       domain-name: priv6.zentralwerk.org
 
@@ -102,9 +102,9 @@ dhcp:
     time: 120
     max-time: 86400
     opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
     host-opts:
       routers: priv7-gw.priv7
-      domain-name-servers: upstream2.core
     string-opts:
       domain-name: priv7.zentralwerk.org
 
@@ -114,9 +114,9 @@ dhcp:
     time: 120
     max-time: 86400
     opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
     host-opts:
       routers: priv8-gw.priv8
-      domain-name-servers: upstream2.core
     string-opts:
       domain-name: priv8.zentralwerk.org
 
@@ -126,9 +126,9 @@ dhcp:
     time: 120
     max-time: 86400
     opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
     host-opts:
       routers: priv9-gw.priv9
-      domain-name-servers: upstream2.core
     string-opts:
       domain-name: priv9.zentralwerk.org
 
@@ -138,9 +138,9 @@ dhcp:
     time: 120
     max-time: 86400
     opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
     host-opts:
       routers: priv10-gw.priv10
-      domain-name-servers: upstream2.core
     string-opts:
       domain-name: priv10.zentralwerk.org
 
@@ -150,9 +150,9 @@ dhcp:
     time: 120
     max-time: 86400
     opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
     host-opts:
       routers: priv11-gw.priv11
-      domain-name-servers: upstream2.core
     string-opts:
       domain-name: priv11.zentralwerk.org
 
@@ -162,9 +162,9 @@ dhcp:
     time: 120
     max-time: 86400
     opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
     host-opts:
       routers: priv12-gw.priv12
-      domain-name-servers: upstream2.core
     string-opts:
       domain-name: priv12.zentralwerk.org
 
@@ -174,9 +174,9 @@ dhcp:
     time: 120
     max-time: 86400
     opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
     host-opts:
       routers: priv13-gw.priv13
-      domain-name-servers: upstream2.core
     string-opts:
       domain-name: priv13.zentralwerk.org
 
@@ -186,9 +186,9 @@ dhcp:
     time: 120
     max-time: 86400
     opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
     host-opts:
       routers: priv14-gw.priv14
-      domain-name-servers: upstream2.core
     string-opts:
       domain-name: priv14.zentralwerk.org
 
@@ -198,9 +198,9 @@ dhcp:
     time: 120
     max-time: 86400
     opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
     host-opts:
       routers: priv15-gw.priv15
-      domain-name-servers: upstream2.core
     string-opts:
       domain-name: priv15.zentralwerk.org
 
@@ -210,9 +210,9 @@ dhcp:
     time: 120
     max-time: 86400
     opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
     host-opts:
       routers: priv16-gw.priv16
-      domain-name-servers: upstream2.core
     string-opts:
       domain-name: priv16.zentralwerk.org
 
@@ -222,9 +222,9 @@ dhcp:
     time: 120
     max-time: 86400
     opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
     host-opts:
       routers: priv17-gw.priv17
-      domain-name-servers: upstream2.core
     string-opts:
       domain-name: priv17.zentralwerk.org
 
@@ -234,9 +234,9 @@ dhcp:
     time: 120
     max-time: 86400
     opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
     host-opts:
       routers: priv18-gw.priv18
-      domain-name-servers: upstream2.core
     string-opts:
       domain-name: priv18.zentralwerk.org
 
@@ -247,9 +247,9 @@ dhcp:
     # 30 days
     max-time: 2592000
     opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
     host-opts:
       routers: priv19-gw.priv19
-      domain-name-servers: upstream2.core
     string-opts:
       domain-name: priv19.zentralwerk.org
 
@@ -259,9 +259,9 @@ dhcp:
     time: 120
     max-time: 86400
     opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
     host-opts:
       routers: priv20-gw.priv20
-      domain-name-servers: upstream2.core
     string-opts:
       domain-name: priv20.zentralwerk.org
 
@@ -271,9 +271,9 @@ dhcp:
     time: 120
     max-time: 86400
     opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
     host-opts:
       routers: priv21-gw.priv21
-      domain-name-servers: upstream2.core
     string-opts:
       domain-name: priv21.zentralwerk.org
 
@@ -283,8 +283,8 @@ dhcp:
     time: 120
     max-time: 86400
     opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
     host-opts:
       routers: radio-gw.radio
-      domain-name-servers: upstream2.core
     string-opts:
       domain-name: radio.zentralwerk.org

salt-pillar/hosts/init.sls

@@ -135,6 +135,7 @@ hosts-inet:
     deployer: 172.20.73.7
     elastic1: 172.20.73.10
     logging: 172.20.73.11
+    dnscache: 172.20.73.8
   priv1:
     priv1-gw: 172.20.74.1
 {%- for i in range(1, 14) %}
@@ -389,6 +390,7 @@ hosts-inet6:
       stats: fd23:42:c3d2:582:2:0:0:3
       radius: fd23:42:c3d2:582:2:0:0:4
       zeit: fd23:42:c3d2:582:2:0:0:5
+      dnscache: fd23:42:c3d2:582:f096:dbff:fee8:427d
     pub:
       pub-gw: fd23:42:c3d2:583::1
     priv1:
@@ -469,6 +471,7 @@ hosts-inet6:
       stats: 2a02:8106:208:5282:2:0:0:3
       radius: 2a02:8106:208:5282:2:0:0:4
       zeit: 2a02:8106:208:5282:2:0:0:5
+      dnscache: 2a02:8106:208:5282:f096:dbff:fee8:427d
 
     pub:
       pub-gw: 2a02:8106:208:5283::1

salt-pillar/switches/init.sls

@@ -18,6 +18,7 @@ switches:
           - GigabitEthernet 1/0/28
         vlans:
           - mgmt
+          - serv
           - pub
           - c3d2
           - radio
@@ -256,6 +257,7 @@ switches:
           - GigabitEthernet 1/0/28
         vlans:
           - mgmt
+          - serv
           - pub
           - c3d2
           - radio