From 6edb9d0e37cb6dbaa4731c667cb52d6220672a78 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Mon, 24 Jun 2019 02:32:09 +0200
Subject: sample switch config for ch-sw0

---
 inventory/host_vars/ch-sw0.yml               | 50 ++++++++++++++++++++++++++++
 roles/dellos6/layer2/templates/interfaces.j2 |  7 +++-
 2 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 inventory/host_vars/ch-sw0.yml

diff --git a/inventory/host_vars/ch-sw0.yml b/inventory/host_vars/ch-sw0.yml
new file mode 100644
index 00000000..b8d3e02b
--- /dev/null
+++ b/inventory/host_vars/ch-sw0.yml
@@ -0,0 +1,50 @@
+---
+switch_interfaces_yaml: |
+  - spec: Te1/0/1
+    description: "sw1"
+    switchport_mode: trunk
+
+  - spec: Te1/0/2
+    description: "RFU"
+    switchport_mode: trunk
+
+  - spec: range Te1/0/3-4
+    vlan: {{ network_zones['lan'].vlan }}
+  - spec: range Gi1/0/5-16
+    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 }}
+
+  - spec: range Gi1/0/19-22
+    vlan: {{ network_zones['iot'].vlan }}
+
+  - spec: range Gi1/0/23-24
+    vlan: {{ network_zones['svc'].vlan }}
+
+  - spec: Gi1/0/25
+    switchport_mode: general
+    tagged_only: true
+    allowed_vlans_tagged:
+      - {{ 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 }}
+  - spec: Gi1/0/27
+    switchport_mode: general
+    tagged_only: true
+    allowed_vlans_tagged:
+      - {{ network_zones['mgmt'].vlan }}
+      - {{ network_zones['iot'].vlan }}
+
+  - spec: Gi1/0/28
+    vlan: {{ network_zones['mgmt'].vlan }}
diff --git a/roles/dellos6/layer2/templates/interfaces.j2 b/roles/dellos6/layer2/templates/interfaces.j2
index 28ec1341..6484db19 100644
--- a/roles/dellos6/layer2/templates/interfaces.j2
+++ b/roles/dellos6/layer2/templates/interfaces.j2
@@ -25,7 +25,12 @@ switchport general ingress-filtering disable
 {%     if 'forbidden_vlans' in interface %}
 switchport general forbidden vlan add {{ interface.forbidden_vlans | join(',') }}
 {%     endif %}
-switchport general allowed vlan add {{ interface.allowed_vlans | join(',') }}
+{%     if 'allowed_vlans_tagged' in interface %}
+switchport general allowed vlan add {{ interface.allowed_vlans_tagged | join(',') }} tagged
+{%     endif %}
+{%     if 'allowed_vlans_untagged' in interface %}
+switchport general allowed vlan add {{ interface.allowed_vlans_untagged | join(',') }} untagged
+{%     endif %}
 {%     if 'pvid' in interface %}
 switchport general pvid {{ interface.pvid }}
 {%     endif %}
-- 
cgit v1.2.3