zentralwerk/network
zentralwerk
/
network
12
4
Fork 2
Code Issues 3 Pull Requests 1 Releases Wiki Activity

switches: move marenz to serv vlan

This commit is contained in:
Astro 2020-05-22 21:38:59 +02:00
parent bef90e6473
commit 2855d9578f
2 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -138,51 +138,52 @@ hosts-inet:
guest{{ 256 + i }}: 172.20.77.{{ i }} guest{{ 256 + i }}: 172.20.77.{{ i }}
{%- endfor %} {%- endfor %}
serv: serv:
serv-gw: 172.20.73.1 serv-gw: 172.20.73.1
dns: 172.20.73.2 dns: 172.20.73.2
stats: 172.20.73.3 stats: 172.20.73.3
radius: 172.20.73.4 radius: 172.20.73.4
zeit: 172.20.73.5 zeit: 172.20.73.5
ntp: 172.20.73.5 ntp: 172.20.73.5
minecraft: 172.20.73.6 minecraft: 172.20.73.6
used1: 172.20.73.7 used1: 172.20.73.7
dnscache: 172.20.73.8 dnscache: 172.20.73.8
used2: 172.20.73.9 used2: 172.20.73.9
used3: 172.20.73.10 used3: 172.20.73.10
used4: 172.20.73.11 used4: 172.20.73.11
used5: 172.20.73.12 used5: 172.20.73.12
logging: 172.20.73.13 logging: 172.20.73.13
used6: 172.20.73.14 used6: 172.20.73.14
elastic1: 172.20.73.15 elastic1: 172.20.73.15
deployer: 172.20.73.16 deployer: 172.20.73.16
used7: 172.20.73.17 used7: 172.20.73.17
used8: 172.20.73.18 used8: 172.20.73.18
used9: 172.20.73.19 used9: 172.20.73.19
ipa: 172.20.73.20 ipa: 172.20.73.20
mongo: 172.20.73.21 mongo: 172.20.73.21
used10: 172.20.73.22 used10: 172.20.73.22
used11: 172.20.73.23 used11: 172.20.73.23
used12: 172.20.73.24 used12: 172.20.73.24
spaceapi: 172.20.73.25 spaceapi: 172.20.73.25
used13: 172.20.73.26 used13: 172.20.73.26
mucbot: 172.20.73.27 mucbot: 172.20.73.27
used14: 172.20.73.28 used14: 172.20.73.28
used15: 172.20.73.29 used15: 172.20.73.29
used16: 172.20.73.30 used16: 172.20.73.30
used17: 172.20.73.31 used17: 172.20.73.31
scrape: 172.20.73.32 scrape: 172.20.73.32
used18: 172.20.73.32 used18: 172.20.73.32
used19: 172.20.73.33 used19: 172.20.73.33
used20: 172.20.73.34 used20: 172.20.73.34
used21: 172.20.73.35 used21: 172.20.73.35
used22: 172.20.73.36 used22: 172.20.73.36
used23: 172.20.73.37 used23: 172.20.73.37
used24: 172.20.73.38 used24: 172.20.73.38
used25: 172.20.73.39 used25: 172.20.73.39
used26: 172.20.73.40 used26: 172.20.73.40
grafana: 172.20.73.43 grafana: 172.20.73.43
kibana: 172.20.73.44 kibana: 172.20.73.44
public-proxy: 172.22.73.45 public-proxy: 172.20.73.45
marenz: 172.20.73.46
priv1: priv1:
priv1-gw: 172.20.74.1 priv1-gw: 172.20.74.1

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

@ -234,12 +234,11 @@ switches:
ports: ports:
- GigabitEthernet1/0/9 - GigabitEthernet1/0/9
access: c3d2 access: c3d2
# c3d2-server8: serv:
c3d2-unknown: mode: access
mode: trunk
ports: ports:
# marenz
- GigabitEthernet1/0/12 - GigabitEthernet1/0/12
access: c3d2
c3d2-monit: c3d2-monit:
mode: trunk mode: trunk
ports: ports: