From a3d4a6df901c852fe1ca76a61d7318b82e8ee936 Mon Sep 17 00:00:00 2001
From: eri451 <eri@c3d2.de>
Date: Mon, 25 Jun 2018 20:59:00 +0200
Subject: [PATCH] add Priv17

refurbished ap18 for new priv network priv17
---
 salt-pillar/cpe/aps.sls                | 15 +++++++++++++++
 salt-pillar/dhcp/init.sls              | 12 ++++++++++++
 salt-pillar/lxc-containers/server1.sls | 11 +++++++++++
 salt-pillar/switches/init.sls          |  1 +
 subnets.md                             |  1 +
 5 files changed, 40 insertions(+)

diff --git a/salt-pillar/cpe/aps.sls b/salt-pillar/cpe/aps.sls
index f9ab0b5..46cb485 100644
--- a/salt-pillar/cpe/aps.sls
+++ b/salt-pillar/cpe/aps.sls
@@ -733,6 +733,21 @@ cpe:
         ssids:
           'ZW public':
             net: pub
+          'Woarbouf':
+            net: priv17
+            psk: |
+            -----BEGIN PGP MESSAGE-----
+            
+            hQEMA2PKcvDMvlKLAQf/W22cuyEAFGNyk6jlq6ysrWFIFkihHwrMMIdTDX8i+4V/
+            juUX0r70xpVL41dD/Rnbbju9hJ2TgxfDKOzBjfc1sOjc0fUGNzYT5Km1775xPU+I
+            H/r9+91bq23/gQCVMkQvDTWwNTiVHtB1h77aRXcaAWFg1XMOuEKU+hNyjZcstLME
+            /zkHT79Y7thJKMVKq60z5USKomzOle+NpD/awLrhUgcMICqO6Os4mIDff853Z0bD
+            tA2Fj1jY20+Mux7jq9Pcz88fYzB0+Uag+/ylJdSSSr+p9n0rLVlquxWuF0EDHOui
+            7PS65SMLbCPfmd/WNE0AJvLEtp80KBLRUwGwH2p/idJNAT29X5kFpfxxnC2lETCv
+            fvanDEpsWkVLITcyA9zF9WXGdDZ3bdyjoQJR9W/S7kCuT5+FZevZ4rZ701+ld/bs
+            b0wpfgtfmGVRXe3IGO4=
+            =t3qs
+            -----END PGP MESSAGE-----
 
   ap19:
     password: |
diff --git a/salt-pillar/dhcp/init.sls b/salt-pillar/dhcp/init.sls
index 8b7dc9f..5f37a5b 100644
--- a/salt-pillar/dhcp/init.sls
+++ b/salt-pillar/dhcp/init.sls
@@ -216,6 +216,18 @@ dhcp:
     string-opts:
       domain-name: priv16.zentralwerk.org
 
+  priv17:
+    start: 172.20.74.16
+    end: 172.20.74.30
+    time: 120
+    max-time: 86400
+    opts:
+    host-opts:
+      routers: priv17-gw.priv17
+      domain-name-servers: upstream2.core
+    string-opts:
+      domain-name: priv17.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 4e0d8a4..1393f3f 100644
--- a/salt-pillar/lxc-containers/server1.sls
+++ b/salt-pillar/lxc-containers/server1.sls
@@ -197,6 +197,17 @@ containers:
         type: phys
         hwaddr: 0A:14:48:01:2A:17
 
+  priv17-gw:
+    interfaces:
+      core:
+        type: veth
+        gw: anon1
+        gw6: upstream1
+        hwaddr: 0A:14:48:01:2A:18
+      priv17:
+        type: phys
+        hwaddr: 0A:14:48:01:2A:19
+
   upstream1:
     interfaces:
       core:
diff --git a/salt-pillar/switches/init.sls b/salt-pillar/switches/init.sls
index a63cab1..3678638 100644
--- a/salt-pillar/switches/init.sls
+++ b/salt-pillar/switches/init.sls
@@ -374,6 +374,7 @@ switches:
         vlans:
           - mgmt
           - pub
+          - priv17
       c3d2-server3:
         mode: bond
         ports:
diff --git a/subnets.md b/subnets.md
index 2f8763a..1d3a55a 100644
--- a/subnets.md
+++ b/subnets.md
@@ -11,6 +11,7 @@ Machine-readable here: [salt-pillar/subnets](./salt-pillar/subnets/init.sls)
 * 172.20.73.192/26
 * 172.20.74.0/24:
   * 172.20.74.0-172.20.74.15/28 PRIV1
+  * 172.20.74.16-172.20.74.31/28 PRIV17
   * 172.20.74.32-172.20.74.47/28 PRIV9
   * 172.20.74.64-172.20.74.79/28 PRIV5
   * 172.20.74.96-172.20.74.111/28 PRIV10