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

add server3-7 to core/mgmt network 

add priv23
This commit is contained in:
Daniel Poelzleithner 2019-07-18 00:31:20 +02:00
parent 7df26e5b03
commit 1c22c41117
4 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt-pillar/bind/dns.sls
View File

@ -17,7 +17,7 @@ bind:
# dns.spaceboyz.net # dns.spaceboyz.net
- 172.22.24.4 - 172.22.24.4
- 2a01:4f8:a0:33d0::4 - 2a01:4f8:a0:33d0::4
serial: 2019070301 serial: 2019071701
reverse-zones-inet: reverse-zones-inet:
- 72.20.172.in-addr.arpa - 72.20.172.in-addr.arpa

10
salt-pillar/hosts/init.sls
View File

@ -2,6 +2,11 @@ hosts-inet:
mgmt: mgmt:
server1: 10.0.0.1 server1: 10.0.0.1
server2: 10.0.0.2 server2: 10.0.0.2
server3: 10.0.0.3
server4: 10.0.0.4
server5: 10.0.0.5
server6: 10.0.0.6
server7: 10.0.0.7
switch-b1: 10.0.0.10 switch-b1: 10.0.0.10
switch-b2: 10.0.0.11 switch-b2: 10.0.0.11
switch-c1: 10.0.0.12 switch-c1: 10.0.0.12
@ -78,6 +83,11 @@ hosts-inet:
core: core:
server1: 172.20.72.1 server1: 172.20.72.1
server2: 172.20.72.102 server2: 172.20.72.102
server3: 172.20.72.103
server4: 172.20.72.104
server5: 172.20.72.105
server6: 172.20.72.106
server7: 172.20.72.107
serv-gw: 172.20.72.2 serv-gw: 172.20.72.2
pub-gw: 172.20.72.3 pub-gw: 172.20.72.3
priv1-gw: 172.20.72.4 priv1-gw: 172.20.72.4

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

@ -41,6 +41,7 @@ switches:
- priv17 - priv17
- priv18 - priv18
- priv19 - priv19
- priv23
mgmt: mgmt:
mode: access mode: access
ports: ports:
@ -165,6 +166,7 @@ switches:
- priv19 - priv19
- priv20 - priv20
- priv21 - priv21
- priv23
c3d2-server4: c3d2-server4:
mode: bond mode: bond
ports: ports:
@ -172,24 +174,39 @@ switches:
- GigabitEthernet1/0/39 - GigabitEthernet1/0/39
- GigabitEthernet1/0/40 - GigabitEthernet1/0/40
vlans: vlans:
- c3d2 - mgmt
- pub
- core
- serv - serv
- c3d2
- radio
- priv23
c3d2-server5: c3d2-server5:
mode: bond mode: bond
ports: ports:
- GigabitEthernet1/0/5 - GigabitEthernet1/0/5
- GigabitEthernet1/0/6 - GigabitEthernet1/0/6
vlans: vlans:
- c3d2 - mgmt
- pub
- core
- serv - serv
- c3d2
- radio
- priv23
c3d2-server6: c3d2-server6:
mode: bond mode: bond
ports: ports:
- GigabitEthernet1/0/7 - GigabitEthernet1/0/7
- GigabitEthernet1/0/8 - GigabitEthernet1/0/8
vlans: vlans:
- c3d2 - mgmt
- pub
- core
- serv - serv
- c3d2
- radio
- priv23
c3d2-server7: c3d2-server7:
mode: trunk mode: trunk
ports: ports:
@ -282,6 +299,7 @@ switches:
- priv17 - priv17
- priv18 - priv18
- priv19 - priv19
- priv23
mgmt: mgmt:
mode: access mode: access
ports: ports:
@ -378,8 +396,12 @@ switches:
- GigabitEthernet1/0/30 - GigabitEthernet1/0/30
- GigabitEthernet1/0/31 - GigabitEthernet1/0/31
vlans: vlans:
- c3d2 - mgmt
- pub
- core
- serv - serv
- c3d2
- radio
ap24: ap24:
mode: trunk mode: trunk
ports: ports:
@ -496,6 +518,7 @@ switches:
- iso16 - iso16
- priv7 - priv7
- priv20 - priv20
- priv23
up1: up1:
mode: access mode: access
ports: '1' ports: '1'
@ -571,6 +594,7 @@ switches:
- mgmt - mgmt
- pub - pub
- c3d2 - c3d2
- priv23
ap38: ap38:
mode: trunk mode: trunk
ports: 7 ports: 7

1
salt-pillar/vlans/init.sls
View File

@ -44,6 +44,7 @@ vlans:
priv22: 61 priv22: 61
priv23: 62 priv23: 62
priv24: 63 priv24: 63
priv25: 64
# Isolated neighbors directly connection with their modems # Isolated neighbors directly connection with their modems
iso1: 101 iso1: 101
iso2: 102 iso2: 102