From 2855d9578f7a3d9d5e04a016cdd89cb679ccb842 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Fri, 22 May 2020 21:38:59 +0200
Subject: [PATCH] switches: move marenz to serv vlan

---
 salt-pillar/hosts/init.sls    | 91 ++++++++++++++++++-----------------
 salt-pillar/switches/init.sls |  7 ++-
 2 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/salt-pillar/hosts/init.sls b/salt-pillar/hosts/init.sls
index fc57b63..b176b31 100644
--- a/salt-pillar/hosts/init.sls
+++ b/salt-pillar/hosts/init.sls
@@ -138,51 +138,52 @@ hosts-inet:
     guest{{ 256 + i }}: 172.20.77.{{ i }}
 {%- endfor %}
   serv:
-    serv-gw:   172.20.73.1
-    dns:       172.20.73.2
-    stats:     172.20.73.3
-    radius:    172.20.73.4
-    zeit:      172.20.73.5
-    ntp:       172.20.73.5
-    minecraft: 172.20.73.6
-    used1:     172.20.73.7
-    dnscache:  172.20.73.8
-    used2:     172.20.73.9
-    used3:     172.20.73.10
-    used4:     172.20.73.11
-    used5:     172.20.73.12
-    logging:   172.20.73.13
-    used6:     172.20.73.14
-    elastic1:  172.20.73.15
-    deployer:  172.20.73.16
-    used7:     172.20.73.17
-    used8:     172.20.73.18
-    used9:     172.20.73.19
-    ipa:       172.20.73.20
-    mongo:     172.20.73.21
-    used10:    172.20.73.22
-    used11:    172.20.73.23
-    used12:    172.20.73.24
-    spaceapi:  172.20.73.25
-    used13:    172.20.73.26
-    mucbot:    172.20.73.27
-    used14:    172.20.73.28
-    used15:    172.20.73.29
-    used16:    172.20.73.30
-    used17:    172.20.73.31
-    scrape:    172.20.73.32
-    used18:    172.20.73.32
-    used19:    172.20.73.33
-    used20:    172.20.73.34
-    used21:    172.20.73.35
-    used22:    172.20.73.36
-    used23:    172.20.73.37
-    used24:    172.20.73.38
-    used25:    172.20.73.39
-    used26:    172.20.73.40
-    grafana:   172.20.73.43
-    kibana:    172.20.73.44
-    public-proxy: 172.22.73.45
+    serv-gw:      172.20.73.1
+    dns:          172.20.73.2
+    stats:        172.20.73.3
+    radius:       172.20.73.4
+    zeit:         172.20.73.5
+    ntp:          172.20.73.5
+    minecraft:    172.20.73.6
+    used1:        172.20.73.7
+    dnscache:     172.20.73.8
+    used2:        172.20.73.9
+    used3:        172.20.73.10
+    used4:        172.20.73.11
+    used5:        172.20.73.12
+    logging:      172.20.73.13
+    used6:        172.20.73.14
+    elastic1:     172.20.73.15
+    deployer:     172.20.73.16
+    used7:        172.20.73.17
+    used8:        172.20.73.18
+    used9:        172.20.73.19
+    ipa:          172.20.73.20
+    mongo:        172.20.73.21
+    used10:       172.20.73.22
+    used11:       172.20.73.23
+    used12:       172.20.73.24
+    spaceapi:     172.20.73.25
+    used13:       172.20.73.26
+    mucbot:       172.20.73.27
+    used14:       172.20.73.28
+    used15:       172.20.73.29
+    used16:       172.20.73.30
+    used17:       172.20.73.31
+    scrape:       172.20.73.32
+    used18:       172.20.73.32
+    used19:       172.20.73.33
+    used20:       172.20.73.34
+    used21:       172.20.73.35
+    used22:       172.20.73.36
+    used23:       172.20.73.37
+    used24:       172.20.73.38
+    used25:       172.20.73.39
+    used26:       172.20.73.40
+    grafana:      172.20.73.43
+    kibana:       172.20.73.44
+    public-proxy: 172.20.73.45
+    marenz:       172.20.73.46
 
   priv1:
     priv1-gw: 172.20.74.1
diff --git a/salt-pillar/switches/init.sls b/salt-pillar/switches/init.sls
index cf2008e..6efefa2 100644
--- a/salt-pillar/switches/init.sls
+++ b/salt-pillar/switches/init.sls
@@ -234,12 +234,11 @@ switches:
         ports:
           - GigabitEthernet1/0/9
         access: c3d2
-#      c3d2-server8:
-      c3d2-unknown:
-        mode: trunk
+      serv:
+        mode: access
         ports:
+          # marenz
           - GigabitEthernet1/0/12
-        access: c3d2
       c3d2-monit:
         mode: trunk
         ports: