From 5c3bf6c1867a3620217e188cdda314c3ec8f9ba3 Mon Sep 17 00:00:00 2001
From: Daniel Poelzleithner <git@poelzi.org>
Date: Thu, 18 Jul 2019 01:15:31 +0200
Subject: [PATCH] add priv23 router/ap

---
 salt-pillar/cpe/aps.sls                | 15 +++++++++++++++
 salt-pillar/lxc-containers/server1.sls | 11 +++++++++++
 salt-pillar/switches/init.sls          |  1 -
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/salt-pillar/cpe/aps.sls b/salt-pillar/cpe/aps.sls
index a0693e9..25082ba 100644
--- a/salt-pillar/cpe/aps.sls
+++ b/salt-pillar/cpe/aps.sls
@@ -363,6 +363,21 @@ cpe:
               rA==
               =TEEI
               -----END PGP MESSAGE-----
+          'teknologi':
+              net: priv23
+              psk: |
+                -----BEGIN PGP MESSAGE-----
+                
+                hQEMA2PKcvDMvlKLAQf+Jl29JzrHlMQCqL7LSHTLYxPMpd9zxUyISPcQfHfBVQjW
+                vhOWiWKG2lyxWu7/OlTICzS2w3Ldln1kCurUoZAH0jM5WO2FsvsbkjCGh7UW7jZ8
+                UKTTIlYVOc0qxyv2/1lI/XmOIKCAiRejLmvIHdAW7sYPsIjfg9dfKoIfuLQxq2IS
+                k/MXsfaxoNGyG/w073zy/QZz8H8RKonwqYv8Ei9CtH6FrbMXqPQnwvNbwUg/3ES8
+                ZVn5JShW5p7o/nHOgKUN4/Dhjhq+b7ZTqly6EdYKFihCPgrfNgeICkBgEa2/E0cK
+                phijtsfe2q8Ora/aE7PC9dJkeXdWdCq4Q7tIScy4WtJIAaNnsirg5uRXo7SOVU8I
+                XK9iZ1YVLtH8o81G6B42sNE8LMC2EhpL0C0UrJyIiImLN3CtxQCe228r/0VI4Uy1
+                KMFxUTHfe+q5
+                =+uIt
+                -----END PGP MESSAGE-----
       'pci0000:00/0000:00:00.0':
         channel: 36
         htmode: HT40+
diff --git a/salt-pillar/lxc-containers/server1.sls b/salt-pillar/lxc-containers/server1.sls
index cc4d879..c2bacce 100644
--- a/salt-pillar/lxc-containers/server1.sls
+++ b/salt-pillar/lxc-containers/server1.sls
@@ -252,6 +252,17 @@ containers:
         type: phys
         hwaddr: 0A:14:48:01:2A:21
 
+  priv23-gw:
+    interfaces:
+      core:
+        type: veth
+        gw: upstream2
+        gw6: upstream2
+        hwaddr: 0A:14:48:01:2A:22
+      priv23:
+        type: phys
+        hwaddr: 0A:14:48:01:2A:23
+
   upstream1:
     interfaces:
       core:
diff --git a/salt-pillar/switches/init.sls b/salt-pillar/switches/init.sls
index da4ef89..33cf67f 100644
--- a/salt-pillar/switches/init.sls
+++ b/salt-pillar/switches/init.sls
@@ -519,7 +519,6 @@ switches:
           - iso16
           - priv7
           - priv20
-          - priv23
       up1:
         mode: access
         ports: '1'