From b4c3b7fab7d8a92626aba8d1134a645761f00dad Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Tue, 26 Jun 2018 20:09:14 +0200
Subject: [PATCH] switches: revert priv17 to access without ap18

---
 salt-pillar/cpe/aps.sls       | 15 ---------------
 salt-pillar/switches/init.sls |  8 ++------
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/salt-pillar/cpe/aps.sls b/salt-pillar/cpe/aps.sls
index 46cb485..f9ab0b5 100644
--- a/salt-pillar/cpe/aps.sls
+++ b/salt-pillar/cpe/aps.sls
@@ -733,21 +733,6 @@ 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/switches/init.sls b/salt-pillar/switches/init.sls
index 1e1f616..ef74729 100644
--- a/salt-pillar/switches/init.sls
+++ b/salt-pillar/switches/init.sls
@@ -370,14 +370,10 @@ switches:
           - mgmt
           - pub
           - priv9
-      ap18:
-        mode: trunk
+      priv17:
+        mode: access
         ports:
           - GigabitEthernet 1/0/13
-        vlans:
-          - mgmt
-          - pub
-          - priv17
       c3d2-server3:
         mode: bond
         ports: