From 97cf004cd4320f0ff5698faa5588989be56a29af Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Wed, 27 Jul 2022 20:33:18 +0200
Subject: add ch-ap2

---
 inventory/group_vars/chaos-at-home-ap/vars.yml |  1 +
 inventory/group_vars/chaos-at-home/network.yml |  1 +
 inventory/host_vars/ch-ap2.yml                 | 11 +++++++++++
 inventory/host_vars/ch-sw1.yml                 | 11 ++++++++++-
 inventory/hosts.ini                            |  1 +
 5 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 inventory/host_vars/ch-ap2.yml

diff --git a/inventory/group_vars/chaos-at-home-ap/vars.yml b/inventory/group_vars/chaos-at-home-ap/vars.yml
index b3d9f84a..fce6fc82 100644
--- a/inventory/group_vars/chaos-at-home-ap/vars.yml
+++ b/inventory/group_vars/chaos-at-home-ap/vars.yml
@@ -8,6 +8,7 @@ accesspoint_wifi_channels:
   5g:
     ch-ap0: 36
     ch-ap1: 48
+    ch-ap2: 40
 
 accesspoint_zones:
   lan: "{{ network_zones.lan.wifi }}"
diff --git a/inventory/group_vars/chaos-at-home/network.yml b/inventory/group_vars/chaos-at-home/network.yml
index 1fb2ac02..fa4109d5 100644
--- a/inventory/group_vars/chaos-at-home/network.yml
+++ b/inventory/group_vars/chaos-at-home/network.yml
@@ -103,6 +103,7 @@ network_zones:
       ch-ups-test: 210
       ch-ap0: 220
       ch-ap1: 221
+      ch-ap2: 222
       ch-mon: 230
       ch-installsmb: 240
       ch-router: 241
diff --git a/inventory/host_vars/ch-ap2.yml b/inventory/host_vars/ch-ap2.yml
new file mode 100644
index 00000000..0ad28a8d
--- /dev/null
+++ b/inventory/host_vars/ch-ap2.yml
@@ -0,0 +1,11 @@
+---
+accesspoint_wireless_frequency_bands:
+  - 5g
+
+accesspoint_wifi_device_htmode:
+  5g: "HT20"
+
+accesspoint_wireless_device_paths:
+  5g: "platform/ahb/18100000.wmac"
+
+openwrt_profile: ubnt_nanostation-loco-m-xw
diff --git a/inventory/host_vars/ch-sw1.yml b/inventory/host_vars/ch-sw1.yml
index 8f2945fc..ad7b6372 100644
--- a/inventory/host_vars/ch-sw1.yml
+++ b/inventory/host_vars/ch-sw1.yml
@@ -24,9 +24,18 @@ switch_interfaces_yaml: |
     tagged_only: yes
     allowed_vlans_tagged: {{ network_zones | list | difference(['lan']) | map('extract', network_zones) | map(attribute='vlan') | list }}
 
-  - spec: range Gi1/0/7-16
+  - spec: range Gi1/0/7-14
     vlan: {{ network_zones.lan.vlan }}
 
+  - spec: range Gi1/0/15-16
+    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/17-22
     vlan: {{ network_zones.iot.vlan }}
 
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index 54fc58ca..0536bb98 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -79,6 +79,7 @@ ch-sw1 host_name=sw1 ansible_host=192.168.42.201
 [chaos-at-home-ap]
 ch-ap0 host_name=ap0
 ch-ap1 host_name=ap1
+ch-ap2 host_name=ap2
 
 [chaos-at-home-sensors]
 ch-sensors0 host_name=sensors0
-- 
cgit v1.2.3