From 3c4b492706946f02571ec03c59c47a54c3efbed0 Mon Sep 17 00:00:00 2001
From: Daniel Poelzleithner <git@poelzi.org>
Date: Thu, 20 Aug 2020 22:12:35 +0200
Subject: [PATCH] use proper ancors for vlans

---
 salt-pillar/switches/init.sls | 77 ++++-------------------------------
 1 file changed, 7 insertions(+), 70 deletions(-)

diff --git a/salt-pillar/switches/init.sls b/salt-pillar/switches/init.sls
index 29a2395..590a5db 100644
--- a/salt-pillar/switches/init.sls
+++ b/salt-pillar/switches/init.sls
@@ -17,7 +17,7 @@ switches:
           - GigabitEthernet 1/0/26
           - GigabitEthernet 1/0/27
           - GigabitEthernet 1/0/28
-        vlans:
+        vlans: &switch_b_vlans
           - mgmt
           - core
           - serv
@@ -200,7 +200,7 @@ switches:
           - GigabitEthernet1/0/38
           - GigabitEthernet1/0/39
           - GigabitEthernet1/0/40
-        vlans:
+        vlans: &server_vlans
           - mgmt
           - pub
           - core
@@ -217,15 +217,7 @@ switches:
           - GigabitEthernet1/0/18
           - GigabitEthernet1/0/19
           - GigabitEthernet1/0/20
-        vlans:
-          - mgmt
-          - pub
-          - core
-          - serv
-          - c3d2
-          - radio
-          - bmx
-          - priv23
+        vlans: *server_vlans
       c3d2-server6:
         mode: bond
         group: 8
@@ -234,30 +226,14 @@ switches:
           - GigabitEthernet1/0/6
           - GigabitEthernet1/0/7
           - GigabitEthernet1/0/8
-        vlans:
-          - mgmt
-          - pub
-          - core
-          - serv
-          - c3d2
-          - radio
-          - bmx
-          - priv23
+        vlans: *server_vlans
       c3d2-server7:
         mode: bond
         group: 9
         ports:
           - GigabitEthernet1/0/9
           - GigabitEthernet1/0/14
-        vlans:
-          - mgmt
-          - pub
-          - core
-          - serv
-          - c3d2
-          - radio
-          - bmx
-          - priv23
+        vlans: *server_vlans
       serv:
         mode: access
         ports:
@@ -320,38 +296,7 @@ switches:
           - GigabitEthernet 1/0/26
           - GigabitEthernet 1/0/27
           - GigabitEthernet 1/0/28
-        vlans:
-          - mgmt
-          - core
-          - serv
-          - pub
-          - c3d2
-          - radio
-          - bmx
-          - priv1
-          - priv2
-          - priv3
-          - priv4
-          - priv5
-          - priv6
-          - priv7
-          - priv8
-          - priv9
-          - priv10
-          - priv11
-          - priv12
-          - priv13
-          - priv14
-          - priv15
-          - priv16
-          - priv17
-          - priv18
-          - priv19
-          - priv22
-          - priv23
-          - priv24
-          - priv26
-          - priv27
+        vlans: *switch_b_vlans
       mgmt:
         mode: access
         ports:
@@ -436,15 +381,7 @@ switches:
         ports:
           - GigabitEthernet1/0/30
           - GigabitEthernet1/0/31
-        vlans:
-          - mgmt
-          - pub
-          - core
-          - serv
-          - c3d2
-          - radio
-          - bmx
-          - priv23
+        vlans: *server_vlans
       ap24:
         mode: trunk
         ports: