priv36, priv37: prepare

salt-pillar/dhcp/init.sls

@@ -451,3 +451,27 @@ dhcp:
       routers: priv35-gw.priv35
     string-opts:
       domain-name: priv35.zentralwerk.org
+
+  priv36:
+    start: 172.20.76.66
+    end: 172.20.76.78
+    time: 120
+    max-time: 86400
+    opts:
+      domain-name-servers: "172.20.73.8, 9.9.9.9"
+    host-opts:
+      routers: priv36-gw.priv36
+    string-opts:
+      domain-name: priv36.zentralwerk.org
+
+  priv37:
+    start: 172.20.76.130
+    end: 172.20.76.142
+    time: 120
+    max-time: 86400
+    opts:
+      domain-name-servers: "172.20.73.8, 9.9.9.9"
+    host-opts:
+      routers: priv37-gw.priv37
+    string-opts:
+      domain-name: priv37.zentralwerk.org

salt-pillar/hosts/init.sls

@@ -151,6 +151,8 @@ hosts-inet:
     priv33-gw: 172.20.72.47
     priv34-gw: 172.20.72.48
     priv35-gw: 172.20.72.49
+    priv36-gw: 172.20.72.50
+    priv37-gw: 172.20.72.51
 
   pub:
     pub-gw: 172.20.78.1
@@ -386,6 +388,16 @@ hosts-inet:
 {%- for i in range(1, 14) %}
     dhcp{{ i }}: 172.20.76.{{ 1 + i }}
 {%- endfor %}
+  priv36:
+    priv36-gw: 172.20.76.65
+{%- for i in range(1, 14) %}
+    dhcp{{ i }}: 172.20.76.{{ 65 + i }}
+{%- endfor %}
+  priv37:
+    priv37-gw: 172.20.76.129
+{%- for i in range(1, 14) %}
+    dhcp{{ i }}: 172.20.76.{{ 129 + i }}
+{%- endfor %}
 
   radio:
     radio-gw: 172.20.73.129
@@ -527,6 +539,8 @@ hosts-inet6:
       priv33-gw: fd23:42:c3d2:581::c:20
       priv34-gw: fd23:42:c3d2:581::c:21
       priv35-gw: fd23:42:c3d2:581::c:22
+      priv36-gw: fd23:42:c3d2:581::c:23
+      priv37-gw: fd23:42:c3d2:581::c:24
 
       freifunk: fd23:42:c3d2:581:8000::1
 
@@ -610,6 +624,10 @@ hosts-inet6:
       priv34-gw: fd23:42:c3d2:5e1::1
     priv35:
       priv35-gw: fd23:42:c3d2:5e2::1
+    priv36:
+      priv36-gw: fd23:42:c3d2:5e3::1
+    priv37:
+      priv37-gw: fd23:42:c3d2:5e4::1
 
     radio:
       radio-gw: fd23:42:c3d2:586::1
@@ -695,6 +713,8 @@ hosts-inet6:
       priv33-gw: 2a02:8106:211:e981::c:20
       priv34-gw: 2a02:8106:211:e981::c:21
       priv35-gw: 2a02:8106:211:e981::c:22
+      priv36-gw: 2a02:8106:211:e981::c:23
+      priv37-gw: 2a02:8106:211:e981::c:24
 
     radio:
       radio-gw: 2a02:8106:208:5286::1
@@ -769,3 +789,7 @@ hosts-inet6:
       priv34-gw: 2a02:8106:211:e9e1::1
     priv35:
       priv35-gw: 2a02:8106:211:e9e2::1
+    priv36:
+      priv36-gw: 2a02:8106:211:e9e3::1
+    priv37:
+      priv37-gw: 2a02:8106:211:e9e4::1

salt-pillar/lxc-containers/server1.sls

@@ -406,6 +406,28 @@ containers:
         type: phys
         hwaddr: 0A:14:48:01:2A:43
 
+  priv36-gw:
+    interfaces:
+      core:
+        type: veth
+        gw: upstream2
+        gw6: upstream2
+        hwaddr: 0A:14:48:01:2A:44
+      priv36:
+        type: phys
+        hwaddr: 0A:14:48:01:2A:45
+
+  priv37-gw:
+    interfaces:
+      core:
+        type: veth
+        gw: upstream2
+        gw6: upstream2
+        hwaddr: 0A:14:48:01:2A:46
+      priv37:
+        type: phys
+        hwaddr: 0A:14:48:01:2A:47
+
   upstream1:
     interfaces:
       core:

salt-pillar/subnets/init.sls

@@ -36,6 +36,8 @@ subnets-inet:
   priv32: 172.20.75.240/28
   priv34: 172.20.74.208/28
   priv35: 172.20.76.0/28
+  priv36: 172.20.76.64/28
+  priv37: 172.20.76.128/28
   c3d2: 172.22.99.0/24
   mgmt: 10.0.0.0/24
   priv17: 172.20.73.128/27
@@ -81,6 +83,8 @@ subnets-inet6:
     priv33: fd23:42:c3d2:5e0::/64
     priv34: fd23:42:c3d2:5e1::/64
     priv35: fd23:42:c3d2:5e2::/64
+    priv36: fd23:42:c3d2:5e3::/64
+    priv37: fd23:42:c3d2:5e4::/64
     c3d2: fd23:42:c3d2:523::/64
   up1:
     c3d2: 2a02:8106:208:5201::/64
@@ -124,3 +128,5 @@ subnets-inet6:
     priv33: 2a02:8106:211:e9e0::/64
     priv34: 2a02:8106:211:e9e1::/64
     priv35: 2a02:8106:211:e9e2::/64
+    priv36: 2a02:8106:211:e9e3::/64
+    priv37: 2a02:8106:211:e9e4::/64

subnets.md

@@ -45,6 +45,8 @@ Machine-readable here: [salt-pillar/subnets](./salt-pillar/subnets/init.sls)
   * 172.20.75.240-172.20.75.255/28 PRIV32
 * 172.20.76.0-172.20.76.255/24 RESERVED
   * 172.20.76.0-172.20.76.31/28 PRIV35
+  * 172.20.76.64-172.20.76.79/28 PRIV36
+  * 172.20.76.128-172.20.76.143/28 PRIV37
 * 172.20.77.0-172.20.77.255/24 RESERVED
 * 172.20.78.0-172.20.79.255/23 PUBLIC