Deploy ap3825i6, replacing sauron; adjust VLANs so Ned / office 8 gets internet; fix broken STP config

inventory.yml

@@ -14,6 +14,10 @@ templates:
       state: absent
     - name: wpad-mesh-wolfssl
       state: absent
+    - name: wpad-basic-mbedtls
+      state: absent
+    - name: wpad-mesh-mbedtls
+      state: absent
     - name: wpad-wolfssl
       state: present
 
@@ -27,6 +31,10 @@ templates:
       state: absent
     - name: wpad-wolfssl
       state: present
+    - name: wpad-basic-mbedtls
+      state: absent
+    - name: wpad-mesh-mbedtls
+      state: absent
 
 openwrt:
   hosts:
@@ -250,14 +258,16 @@ openwrt:
           ports:
           - eth0.7
           - eth1.7
-          - eth0
+          stp: 1
-          - eth1
 
         - name: br-vgolan
           type: bridge
           ports:
           - eth0.2
           - eth1.2
+          - eth0
+          - eth1
+          stp: 1
 
         interface:
         - key: lan
@@ -297,3 +307,62 @@ openwrt:
         - ifname: vgo5
           device: radio1
           template: vgo5
+
+    ap3825i6:
+      packages:
+        ath10k: *package_ath10k_mesh
+        wpad: *package_wpad_mesh
+
+      network:
+        device:
+        - name: br-lan
+          type: bridge
+          ports:
+          - eth1
+          stp: 1
+
+        - name: br-vgolan
+          type: bridge
+          ports:
+          - eth1.2
+          stp: 1
+
+        interface:
+        - key: lan
+          device: br-lan
+          proto: dhcp
+
+        - key: vgolan
+          device: br-vgolan
+          proto: dhcp
+
+      wireless:
+        wifi_device:
+        - name: radio0
+          path: ffe0a000.pcie/pcia000:02/a000:02:00.0/a000:03:00.0
+          template: qca9880_5
+          channel: 157
+
+        - name: radio1
+          path: ffe09000.pcie/pci9000:00/9000:00:00.0/9000:01:00.0
+          template: ath9k_2
+          channel: 1
+
+        wifi_iface:
+        - ifname: vgo2
+          device: radio1
+          template: vgo2
+          disabled: 0
+
+        - ifname: vgo5
+          device: radio0
+          template: vgo5
+          disabled: 0
+
+        - ifname: labb2
+          device: radio1
+          template: labb
+
+        - ifname: labb5
+          device: radio0
+          template: labb