From fd9a032839030a0ac1c9f1489eb61376f0779fd3 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Tue, 16 Jun 2020 00:14:49 +0200
Subject: add ch-equinox-ws to managment vlan

---
 inventory/group_vars/chaos-at-home/network.yml |  1 +
 inventory/host_vars/ch-sw0.yml                 | 39 ++++++++++++++++----------
 inventory/host_vars/ch-sw1.yml                 | 10 +++----
 3 files changed, 30 insertions(+), 20 deletions(-)

(limited to 'inventory')

diff --git a/inventory/group_vars/chaos-at-home/network.yml b/inventory/group_vars/chaos-at-home/network.yml
index 8585bfd5..f2a5e878 100644
--- a/inventory/group_vars/chaos-at-home/network.yml
+++ b/inventory/group_vars/chaos-at-home/network.yml
@@ -52,6 +52,7 @@ network_zones:
     vlan: 42
     prefix: 192.168.42.0/24
     offsets:
+      ch-equinox-ws: 1
       ch-jump: 22
       ch-prometheus: 99
       ch-sw0: 200
diff --git a/inventory/host_vars/ch-sw0.yml b/inventory/host_vars/ch-sw0.yml
index 9bbfa636..02e56259 100644
--- a/inventory/host_vars/ch-sw0.yml
+++ b/inventory/host_vars/ch-sw0.yml
@@ -8,46 +8,55 @@ switch_interfaces_yaml: |
     description: "RFU"
     switchport_mode: trunk
 
-  - spec: range Te1/0/3-4
-    vlan: {{ network_zones['lan'].vlan }}
+  - spec: Te1/0/3
+    description: "equinox-ws"
+    switchport_mode: general
+    pvid: {{ network_zones.lan.vlan }}
+    allowed_vlans_untagged:
+    - {{ network_zones.lan.vlan }}
+    allowed_vlans_tagged:
+    - {{ network_zones.mgmt.vlan }}
+
+  - spec: Te1/0/4
+    vlan: {{ network_zones.lan.vlan }}
   - spec: range Gi1/0/5-16
-    vlan: {{ network_zones['lan'].vlan }}
+    vlan: {{ network_zones.lan.vlan }}
 
   - spec: range Gi1/0/17-18
     description: "ap"
     switchport_mode: general
     tagged_only: true
     allowed_vlans_tagged:
-      - {{ network_zones['mgmt'].vlan }}
-      - {{ network_zones['lan'].vlan }}
-      - {{ network_zones['iot'].vlan }}
+    - {{ network_zones.mgmt.vlan }}
+    - {{ network_zones.lan.vlan }}
+    - {{ network_zones.iot.vlan }}
 
   - spec: range Gi1/0/19-22
-    vlan: {{ network_zones['iot'].vlan }}
+    vlan: {{ network_zones.iot.vlan }}
 
   - spec: Gi1/0/23
-    vlan: {{ network_zones['svc'].vlan }}
+    vlan: {{ network_zones.svc.vlan }}
 
   - spec: Gi1/0/24
-    vlan: {{ network_zones['magenta'].vlan }}
+    vlan: {{ network_zones.magenta.vlan }}
 
   - spec: Gi1/0/25
     switchport_mode: general
     tagged_only: true
     allowed_vlans_tagged:
-      - {{ network_zones['lan'].vlan }}
-      - {{ network_zones['svc'].vlan }}
+    - {{ network_zones.lan.vlan }}
+    - {{ network_zones.svc.vlan }}
   - spec: Gi1/0/26
     switchport_mode: general
     tagged_only: true
     allowed_vlans_tagged:
-      - {{ network_zones['magenta'].vlan }}
+    - {{ network_zones.magenta.vlan }}
   - spec: Gi1/0/27
     switchport_mode: general
     tagged_only: true
     allowed_vlans_tagged:
-      - {{ network_zones['mgmt'].vlan }}
-      - {{ network_zones['iot'].vlan }}
+    - {{ network_zones.mgmt.vlan }}
+    - {{ network_zones.iot.vlan }}
 
   - spec: Gi1/0/28
-    vlan: {{ network_zones['mgmt'].vlan }}
+    vlan: {{ network_zones.mgmt.vlan }}
diff --git a/inventory/host_vars/ch-sw1.yml b/inventory/host_vars/ch-sw1.yml
index 21fb8665..1df69954 100644
--- a/inventory/host_vars/ch-sw1.yml
+++ b/inventory/host_vars/ch-sw1.yml
@@ -9,15 +9,15 @@ switch_interfaces_yaml: |
     switchport_mode: trunk
 
   - spec: range Te1/0/3-4
-    vlan: {{ network_zones['lan'].vlan }}
+    vlan: {{ network_zones.lan.vlan }}
   - spec: range Gi1/0/5-16
-    vlan: {{ network_zones['lan'].vlan }}
+    vlan: {{ network_zones.lan.vlan }}
 
   - spec: range Gi1/0/17-22
-    vlan: {{ network_zones['iot'].vlan }}
+    vlan: {{ network_zones.iot.vlan }}
 
   - spec: range Gi1/0/23-26
-    vlan: {{ network_zones['svc'].vlan }}
+    vlan: {{ network_zones.svc.vlan }}
 
   - spec: range Gi1/0/27-28
-    vlan: {{ network_zones['mgmt'].vlan }}
+    vlan: {{ network_zones.mgmt.vlan }}
-- 
cgit v1.2.3