winzlieb/network
winzlieb
/
network
forked from zentralwerk/network
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cpe: switch ap2+ap3 to c3d2 vlan

This commit is contained in:
Astro 2016-12-13 01:12:27 +01:00
parent 11cb02b4c4
commit 1a7ad28907
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
salt-pillar/cpe/aps.sls
View File

@ -58,7 +58,7 @@ cpe:
model: TL-Archer-C7v2 model: TL-Archer-C7v2
location: C3D2 Main location: C3D2 Main
lan-access: priv1 lan-access: c3d2
radios: radios:
'platform/qca955x_wmac': 'platform/qca955x_wmac':
channel: 1 channel: 1
@ -67,7 +67,7 @@ cpe:
'ZW public': 'ZW public':
net: pub net: pub
'C3D2 legacy': 'C3D2 legacy':
net: priv1 net: c3d2
psk: | psk: |
-----BEGIN PGP MESSAGE----- -----BEGIN PGP MESSAGE-----
@ -88,7 +88,7 @@ cpe:
'ZW public': 'ZW public':
net: pub net: pub
'C3D2': 'C3D2':
net: priv1 net: c3d2
psk: | psk: |
-----BEGIN PGP MESSAGE----- -----BEGIN PGP MESSAGE-----
@ -120,7 +120,7 @@ cpe:
model: TL-WDR4300 model: TL-WDR4300
location: C3D2 Kammer location: C3D2 Kammer
lan-access: priv1 lan-access: c3d2
radios: radios:
'platform/ar934x_wmac': 'platform/ar934x_wmac':
channel: 13 channel: 13
@ -129,7 +129,7 @@ cpe:
'ZW public': 'ZW public':
net: pub net: pub
'C3D2 legacy': 'C3D2 legacy':
net: priv1 net: c3d2
psk: | psk: |
-----BEGIN PGP MESSAGE----- -----BEGIN PGP MESSAGE-----
@ -150,7 +150,7 @@ cpe:
'ZW public': 'ZW public':
net: pub net: pub
'C3D2': 'C3D2':
net: priv1 net: c3d2
psk: | psk: |
-----BEGIN PGP MESSAGE----- -----BEGIN PGP MESSAGE-----

5
salt-pillar/switches/init.sls
View File

@ -55,8 +55,6 @@ switches:
- mgmt - mgmt
- pub - pub
- c3d2 - c3d2
# obsolete:
- priv1
ap3: ap3:
mode: trunk mode: trunk
ports: ports:
@ -65,8 +63,6 @@ switches:
- mgmt - mgmt
- pub - pub
- c3d2 - c3d2
# obsolete:
- priv1
ap4: ap4:
mode: trunk mode: trunk
ports: ports:
@ -135,6 +131,7 @@ switches:
- pub - pub
- core - core
- serv - serv
- c3d2
- up1 - up1
- up2 - up2
- up3 - up3