From 739ccf8ae535698a9ec8c0e4e91ec0f2ac283eba Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Tue, 27 Nov 2018 22:40:19 +0100
Subject: [PATCH] split priv19 into priv{19,21}

---
 salt-pillar/cpe/aps.sls                |  4 ++--
 salt-pillar/dhcp/init.sls              | 12 ++++++++++++
 salt-pillar/lxc-containers/server1.sls | 11 +++++++++++
 salt-pillar/switches/init.sls          |  4 +++-
 4 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/salt-pillar/cpe/aps.sls b/salt-pillar/cpe/aps.sls
index 4035789..3815643 100644
--- a/salt-pillar/cpe/aps.sls
+++ b/salt-pillar/cpe/aps.sls
@@ -1589,7 +1589,7 @@ cpe:
     model: TL-Archer-C7v5
     version: 18.06.1
     location: B3.11.01
-    lan-access: priv19
+    lan-access: priv21
     radios:
       'platform/qca956x_wmac':
         channel: 11
@@ -1598,7 +1598,7 @@ cpe:
           'ZW public':
             net: pub
           'hechtfilm.de':
-            net: priv19
+            net: priv21
             psk: |
               -----BEGIN PGP MESSAGE-----
               
diff --git a/salt-pillar/dhcp/init.sls b/salt-pillar/dhcp/init.sls
index 424f4f0..aabb7fc 100644
--- a/salt-pillar/dhcp/init.sls
+++ b/salt-pillar/dhcp/init.sls
@@ -264,6 +264,18 @@ dhcp:
     string-opts:
       domain-name: priv20.zentralwerk.org
 
+  priv21:
+    start: 172.20.74.146
+    end: 172.20.74.158
+    time: 120
+    max-time: 86400
+    opts:
+    host-opts:
+      routers: priv21-gw.priv21
+      domain-name-servers: upstream2.core
+    string-opts:
+      domain-name: priv21.zentralwerk.org
+
   radio:
     start: 172.20.73.130
     end: 172.20.73.190
diff --git a/salt-pillar/lxc-containers/server1.sls b/salt-pillar/lxc-containers/server1.sls
index 58a77ce..a4f229c 100644
--- a/salt-pillar/lxc-containers/server1.sls
+++ b/salt-pillar/lxc-containers/server1.sls
@@ -241,6 +241,17 @@ containers:
         type: phys
         hwaddr: 0A:14:48:01:2A:1F
 
+  priv21-gw:
+    interfaces:
+      core:
+        type: veth
+        gw: upstream2
+        gw6: upstream1
+        hwaddr: 0A:14:48:01:2A:20
+      priv20:
+        type: phys
+        hwaddr: 0A:14:48:01:2A:21
+
   upstream1:
     interfaces:
       core:
diff --git a/salt-pillar/switches/init.sls b/salt-pillar/switches/init.sls
index 3a95b3a..87f8fd3 100644
--- a/salt-pillar/switches/init.sls
+++ b/salt-pillar/switches/init.sls
@@ -40,6 +40,7 @@ switches:
           - priv17
           - priv18
           - priv19
+          - priv21
       mgmt:
         mode: access
         ports:
@@ -284,6 +285,7 @@ switches:
           - priv17
           - priv18
           - priv19
+          - priv21
       mgmt:
         mode: access
         ports:
@@ -432,7 +434,7 @@ switches:
         vlans:
           - mgmt
           - pub
-          - priv19
+          - priv21
     password: |
       -----BEGIN PGP MESSAGE-----