From fe673209c6000cf28e988fe5d76380839f927830 Mon Sep 17 00:00:00 2001 From: Astro Date: Sun, 7 Nov 2021 02:26:37 +0100 Subject: [PATCH] switches: remove hardcoded vlan memberships --- salt-pillar/switches/init.sls | 415 ---------------------------------- 1 file changed, 415 deletions(-) diff --git a/salt-pillar/switches/init.sls b/salt-pillar/switches/init.sls index 541c3cd..429cc5e 100644 --- a/salt-pillar/switches/init.sls +++ b/salt-pillar/switches/init.sls @@ -14,39 +14,6 @@ switches: - g26 - g27 - g28 - vlans: &switch_b_vlans - - mgmt - - core - - serv - - pub - - c3d2 - - cluster - - 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 - - priv35 mgmt: mode: access ports: @@ -67,19 +34,10 @@ switches: mode: trunk ports: - g16 - vlans: - - mgmt - - pub - - c3d2 - - priv23 ap23: mode: trunk ports: - g10 - vlans: - - mgmt - - pub - - priv30 switch-c1: mode: bond group: 2 @@ -88,65 +46,10 @@ switches: - g30 - g31 - g32 - vlans: - - mgmt - - pub - - core - - serv - - c3d2 - - bmx - - up1 - - up2 - - up3 - - up4 - - up5 - - up6 - - up7 - - up8 - - priv20 - - priv25 - - priv26 - - priv28 - - priv29 - - priv31 - - priv32 - - priv33 - - priv34 - - priv36 - - priv37 - - priv41 - - iso1 - - iso2 - - iso3 - - iso4 - - iso5 - - iso6 - - iso7 - - iso8 - - iso9 - - iso10 - - iso11 - - iso12 - - iso13 - - iso14 - - iso15 - - iso16 switch-d1: mode: trunk ports: - g34 - vlans: - - mgmt - - core - - pub - - c3d2 - - bmx - - priv15 - - priv16 - - priv21 - - priv38 - - priv40 - - priv42 server1: mode: trunk ports: @@ -154,63 +57,6 @@ switches: # - g47 # - g48 - g24 - vlans: &server1_vlans - - mgmt - - pub - - core - - serv - - c3d2 - - cluster - - up1 - - up2 - - up3 - - up4 - - up5 - - up6 - - up7 - - up8 - - priv1 - - priv2 - - priv3 - - priv4 - - priv5 - - priv6 - - priv7 - - priv8 - - priv9 - - priv10 - - priv11 - - priv12 - - priv13 - - priv14 - - priv15 - - priv16 - - priv17 - - priv18 - - priv19 - - priv20 - - priv21 - - priv22 - - priv23 - - priv24 - - priv25 - - priv26 - - priv27 - - priv28 - - priv29 - - priv30 - - priv31 - - priv32 - - priv33 - - priv34 - - priv35 - - priv36 - - priv37 - - priv38 - - priv39 - - priv40 - - priv41 - - priv42 server2: mode: bond group: 1 @@ -219,7 +65,6 @@ switches: - g38 - g39 - g40 - vlans: *server1_vlans server5: mode: bond group: 6 @@ -228,15 +73,6 @@ switches: - g18 - g19 - g20 - vlans: &server_vlans - - mgmt - - pub - - core - - serv - - c3d2 - - cluster - - bmx - - priv23 server6: mode: bond group: 8 @@ -245,7 +81,6 @@ switches: - g6 - g7 - g8 - vlans: *server_vlans server7: mode: bond group: 7 @@ -254,7 +89,6 @@ switches: - g11 - g14 - g15 - vlans: *server_vlans server8: mode: bond group: 5 @@ -263,7 +97,6 @@ switches: - g36 - g37 - g13 - vlans: *server_vlans serv: mode: access ports: @@ -274,8 +107,6 @@ switches: # ports: # - g21 # - g45 - # vlans: - # - c3d2 c3d2: mode: access ports: @@ -288,13 +119,6 @@ switches: - g42 - g43 - g44 - vlans: - - mgmt - - iso4 - - pub - - c3d2 - - bmx - - priv39 password: | -----BEGIN PGP MESSAGE----- @@ -326,7 +150,6 @@ switches: - GigabitEthernet 1/0/26 - GigabitEthernet 1/0/27 - GigabitEthernet 1/0/28 - vlans: *switch_b_vlans mgmt: mode: access ports: @@ -355,50 +178,26 @@ switches: mode: trunk ports: - GigabitEthernet 1/0/6 - vlans: - - mgmt - - pub - - priv4 ap5: mode: trunk ports: - GigabitEthernet 1/0/7 - vlans: - - mgmt - - priv5 - - pub ap1: mode: trunk ports: - GigabitEthernet 1/0/8 - vlans: - - mgmt - - priv6 - - pub ap11: mode: trunk ports: - GigabitEthernet 1/0/10 - vlans: - - mgmt - - priv8 - - pub ap15: mode: trunk ports: - GigabitEthernet 1/0/12 - vlans: - - mgmt - - priv10 - - pub ap53: mode: trunk ports: - GigabitEthernet 1/0/15 - vlans: - - mgmt - - pub - - priv11 pub: mode: access ports: @@ -409,25 +208,16 @@ switches: mode: trunk ports: - GigabitEthernet 1/0/18 - vlans: - - mgmt - - pub - - priv9 ap51: mode: trunk ports: - GigabitEthernet 1/0/13 - vlans: - - mgmt - - pub - - priv17 server3: mode: bond group: 1 ports: - GigabitEthernet1/0/30 - GigabitEthernet1/0/31 - vlans: *server_vlans server9: mode: bond group: 3 @@ -435,47 +225,26 @@ switches: - GigabitEthernet1/0/2 - GigabitEthernet1/0/29 - GigabitEthernet1/0/32 - vlans: *server_vlans ap24: mode: trunk ports: - GigabitEthernet 1/0/34 - vlans: - - mgmt - - pub - - priv12 ap25: mode: trunk ports: - GigabitEthernet 1/0/35 - vlans: - - mgmt - - pub - - priv12 ap29: mode: trunk ports: - GigabitEthernet 1/0/36 - vlans: - - mgmt - - pub - - priv13 ap30: mode: trunk ports: - GigabitEthernet 1/0/22 - vlans: - - mgmt - - pub - - priv14 ap35: mode: trunk ports: - GigabitEthernet 1/0/23 - vlans: - - mgmt - - pub - - priv18 priv19: mode: access ports: @@ -484,26 +253,14 @@ switches: mode: trunk ports: - GigabitEthernet 1/0/39 - vlans: - - mgmt - - pub - - priv19 ap39: mode: trunk ports: - GigabitEthernet 1/0/17 - vlans: - - mgmt - - pub - - priv7 ap40: mode: trunk ports: - GigabitEthernet 1/0/21 - vlans: - - mgmt - - pub - - priv22 priv24: mode: access ports: @@ -513,34 +270,18 @@ switches: mode: trunk ports: - GigabitEthernet 1/0/37 - vlans: - - mgmt - - pub - - priv26 ap55: mode: trunk ports: - GigabitEthernet 1/0/19 - vlans: - - mgmt - - pub - - priv6 ap56: mode: trunk ports: - GigabitEthernet 1/0/9 - vlans: - - mgmt - - pub - - priv6 ap54: mode: trunk ports: - GigabitEthernet 1/0/38 - vlans: - - mgmt - - pub - - priv35 password: | -----BEGIN PGP MESSAGE----- @@ -568,48 +309,6 @@ switches: mode: bond group: 2 ports: 21-24 - vlans: - - mgmt - - pub - - serv - - c3d2 - - bmx - - up1 - - up2 - - up3 - - up4 - - up5 - - up6 - - up7 - - up8 - - iso1 - - iso2 - - iso3 - - iso4 - - iso5 - - iso6 - - iso7 - - iso8 - - iso9 - - iso10 - - iso11 - - iso12 - - iso13 - - iso14 - - iso15 - - iso16 - - priv20 - - priv25 - - priv26 - - priv28 - - priv29 - - priv31 - - priv32 - - priv33 - - priv34 - - priv36 - - priv37 - - priv41 up1: mode: access ports: '1' @@ -634,12 +333,6 @@ switches: switch-dach: mode: trunk ports: '6' - vlans: - - mgmt - - pub - - serv - - bmx - - up3 iso1: mode: access ports: '9' @@ -662,56 +355,24 @@ switches: mode: trunk # Saal A Foyer ports: 20 - vlans: - - mgmt - - pub - - priv25 # Saal A: durch dummen PoE-Switch mit Aggregation an ap44-50 + switch-a1 switch-a1: mode: bond group: 1 ports: 15-16 lacp: no - vlans: - - mgmt - - iso4 - - pub - - priv25 - - priv31 - - priv32 - - priv36 ap19: mode: trunk ports: 17 - vlans: - - mgmt - - pub - - priv26 - - priv41 ap26: mode: trunk ports: 18 - vlans: - - mgmt - - pub - - priv37 ap17: mode: trunk ports: 19 - vlans: - - mgmt - - pub - - priv29 - - priv33 - - priv34 ap38: mode: trunk ports: 7 - vlans: - - mgmt - - pub - - priv20 - - priv28 password: | -----BEGIN PGP MESSAGE----- @@ -735,61 +396,25 @@ switches: mode: bond ports: 1 group: 1 - vlans: - - mgmt - - pub - - c3d2 - - bmx - - priv15 - - priv16 - - priv21 - - priv38 - - priv40 - - priv42 ap9: mode: trunk ports: 5 - vlans: - - mgmt - - pub - - priv16 ap10: mode: trunk ports: 4 - vlans: - - mgmt - - pub - - priv15 - - priv21 ap7: mode: trunk # Turm D, 5. Etage ports: 8 - vlans: - - mgmt - - pub - - priv40 ap22: mode: trunk ports: 2 - vlans: - - mgmt - - pub ap12: mode: trunk ports: 7 - vlans: - - mgmt - - pub - - priv38 - - priv42 ap3: mode: trunk ports: 3 - vlans: - - mgmt - - pub - - c3d2 password: | -----BEGIN PGP MESSAGE----- @@ -820,48 +445,20 @@ switches: mode: bond group: 1 ports: 21-24 - vlans: - - mgmt - - iso4 - - pub - - c3d2 - - bmx - - priv39 ap2: mode: trunk ports: 3 - vlans: - - mgmt - - pub - - c3d2 - - bmx ap31: mode: trunk ports: 2 - vlans: - - mgmt - - pub - - c3d2 - - bmx - - priv39 # For testing a new ap ap-test1: mode: trunk ports: 4 - vlans: - - mgmt - - pub - - c3d2 - - bmx # For testing a new ap ap-test2: mode: trunk ports: 5 - vlans: - - mgmt - - pub - - c3d2 - - bmx iso4: mode: access ports: 6 @@ -928,12 +525,6 @@ switches: # statisch konfigurierter Aggregation mode: trunk ports: 7 - vlans: - - mgmt - - iso4 - - pub - - priv25 - - priv31 iso4: mode: access ports: @@ -962,12 +553,6 @@ switches: switch-c1: mode: trunk ports: '24' - vlans: - - mgmt - - pub - - serv - - bmx - - up3 # Starlink up3: mode: access