prepare radio network

salt-pillar/dhcp/init.sls

@@ -155,3 +155,15 @@ dhcp:
       domain-name-servers: upstream2.core
     string-opts:
       domain-name: priv11.zentralwerk.online
+
+  radio:
+    start: 172.20.73.130
+    end: 172.20.73.190
+    time: 120
+    max-time: 86400
+    opts:
+    host-opts:
+      routers: radio-gw.radio
+      domain-name-servers: upstream2.core
+    string-opts:
+      domain-name: radio.zentralwerk.online

salt-pillar/hosts/init.sls

@@ -72,6 +72,7 @@ hosts-inet:
     priv16-gw: 172.20.72.26
     bgp: 172.20.72.27
     mgmt-gw: 172.20.72.28
+    radio-gw: 172.20.72.29
 
   pub:
     pub-gw: 172.20.76.1
@@ -144,6 +145,9 @@ hosts-inet:
   priv16:
     priv16-gw: 172.20.75.225
 
+  radio:
+    radio-gw: 172.20.73.129
+
   c3d2:
     c3d2-anon: 172.22.99.1
     c3d2-gw: 172.22.99.4
@@ -267,6 +271,9 @@ hosts-inet6:
   priv16:
     priv16-gw: fd23:42:c3d2:5cf::1
 
+  radio:
+    radio-gw: fd23:42:c3d2:586::1
+
   c3d2:
     c3d2-anon: fd23:42:c3d2:523::c3d2:1
     c3d2-gw: fd23:42:c3d2:523::c3d2:4

salt-pillar/lxc-containers/server1.sls

@@ -243,3 +243,14 @@ containers:
         gw: serv-gw
         gw6: serv-gw
         hwaddr: 0A:14:48:01:25:00
+
+  radio-gw:
+    interfaces:
+      core:
+        type: veth
+        gw: upstream2
+        gw6: upstream2
+        hwaddr: 0A:14:48:01:06:02
+      radio:
+        type: veth
+        hwaddr: 0A:14:48:01:06:00

salt-pillar/subnets/init.sls

@@ -20,12 +20,14 @@ subnets-inet:
   priv16: 172.20.75.224/28
   c3d2: 172.22.99.0/24
   mgmt: 10.0.0.0/24
+  radio: 172.20.73.128/26
 
 subnets-inet6:
   mgmt: fd23:42:c3d2:580::/64
   core: fd23:42:c3d2:581::/64
   serv: fd23:42:c3d2:582::/64
   pub: fd23:42:c3d2:583::/64
+  radio: fd23:42:c3d2:586::/64
   priv1: fd23:42:c3d2:5c0::/64
   priv2: fd23:42:c3d2:5c1::/64
   priv3: fd23:42:c3d2:5c2::/64

salt-pillar/switches/init.sls

@@ -19,6 +19,7 @@ switches:
         vlans:
           - mgmt
           - pub
+          - radio
           - priv1
           - priv2
           - priv3
@@ -121,6 +122,7 @@ switches:
         vlans:
           - mgmt
           - pub
+          - radio
           - up1
           - up2
           - up3
@@ -167,6 +169,7 @@ switches:
           - core
           - serv
           - c3d2
+          - radio
           - up1
           - up2
           - up3
@@ -253,6 +256,7 @@ switches:
         vlans:
           - mgmt
           - pub
+          - radio
           - priv1
           - priv2
           - priv3

salt-pillar/top.sls

@@ -14,10 +14,10 @@ base:
     - dhcp
     - bird.radv
     - bird.ospf
-  'pub-gw or serv-gw':
-    - bird.ospf
+  'pub-gw or serv-gw or radio-gw':
     - dhcp
     - bird.radv
+    - bird.ospf
   'c3d2-gw or c3d2-anon or mgmt-gw':
     - bird.ospf
   'bgp':

salt-pillar/vlans/init.sls

@@ -9,6 +9,7 @@ vlans:
   pub: 4
   # C3D2 home network
   c3d2: 5
+  radio: 6
   # Modems
   up1: 10
   up2: 11

subnets.md

@@ -7,7 +7,8 @@ Machine-readable here: [salt-pillar/subnets](./salt-pillar/subnets/init.sls)
 * 172.20.72.128/25
 * 172.20.73.0-172.20.73.63/26 SERVERS
 * 172.20.73.64/26 RESERVED FOR EXPANDING SERVERS
-* 172.20.73.128/25
+* 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