From 2ee15def328e738ad3bee0117d8ee85ec8ba2043 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Sat, 28 Mar 2020 16:53:20 +0100
Subject: [PATCH] switch-c3d2-main: free up priv25+ap-test*

---
 salt-pillar/switches/init.sls | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/salt-pillar/switches/init.sls b/salt-pillar/switches/init.sls
index 92cde7a..82b5781 100644
--- a/salt-pillar/switches/init.sls
+++ b/salt-pillar/switches/init.sls
@@ -260,8 +260,6 @@ switches:
           - mgmt
           - pub
           - c3d2
-          - priv25
-          - iso4
     password: |
       -----BEGIN PGP MESSAGE-----
 
@@ -742,42 +740,31 @@ switches:
           - mgmt
           - pub
           - c3d2
-          - priv25
-          - iso4
-      ap-test1:
+      ap2:
         mode: trunk
         ports: 2
         vlans:
           - mgmt
           - pub
           - c3d2
-      ap-test2:
+      ap31:
         mode: trunk
         ports: 3
         vlans:
           - mgmt
           - pub
           - c3d2
-      ap2:
+      # For testing a new ap
+      ap-test:
         mode: trunk
         ports: 4
         vlans:
           - mgmt
           - pub
           - c3d2
-      ap31:
-        mode: trunk
-        ports: 5
-        vlans:
-          - mgmt
-          - pub
-          - c3d2
-      iso4:
-        mode: access
-        ports: '6-9'
       c3d2:
         mode: access
-        ports: '10-20'
+        ports: '5-20'
 
     password: |
       -----BEGIN PGP MESSAGE-----