Substantial cleanup for 12-22 North's network

inventory.yml

@@ -30,7 +30,7 @@ templates:
 
 openwrt:
   hosts:
-    ap3825i1.lan:
+    ap3825i1:
       packages:
         ath10k: *package_ath10k_mesh
         wpad: *package_wpad_mesh
@@ -71,7 +71,7 @@ openwrt:
           device: radio1
           template: labb
 
-    ap3825i2.lan:
+    ap3825i4:
       packages:
         ath10k: *package_ath10k_mesh
         wpad: *package_wpad_mesh
@@ -82,7 +82,7 @@ openwrt:
           type: bridge
           ports:
           - eth0
-          - eth1
+          - eth1.7
           stp: 1
 
         - name: br-vgolan
@@ -104,12 +104,12 @@ openwrt:
       wireless:
         wifi_device:
         - name: radio0
-          path: ffe0a000.pcie/pcia000:02/a000:02:00.0/a000:03:00.0
+          path: ffe0a000.pcie/pci0001:02/0001:02:00.0/0001:03:00.0
           template: qca9880_5
           channel: 48
 
         - name: radio1
-          path: ffe09000.pcie/pci9000:00/9000:00:00.0/9000:01:00.0
+          path: ffe09000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0
           template: ath9k_2
           channel: 6
 
@@ -147,7 +147,7 @@ openwrt:
           template: labbmesh
           disabled: 0
 
-    ap3825i3.lan:
+    ap3825i3:
       network:
         device:
         - name: br-lan
@@ -199,7 +199,7 @@ openwrt:
           device: radio0
           template: labb
 
-    mr16_4.lan:
+    mr16_4:
       network:
         device:
         - name: br-lan
@@ -239,44 +239,61 @@ openwrt:
           device: radio1
           template: labbmesh
 
-    ap3825i4.lan:
+    ap3825i5:
       packages:
-        ath10k: *package_ath10k_mesh
-        wpad: *package_wpad_mesh
+        wpad: *package_wpad_full
 
       network:
         device:
         - name: br-lan
           type: bridge
           ports:
+          - eth0.7
+          - eth1.7
           - eth0
           - eth1
-          stp: 1
+
+        - name: br-vgolan
+          type: bridge
+          ports:
+          - eth0.2
+          - eth1.2
 
         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: 48
-
-        - name: radio1
-          path: ffe09000.pcie/pci9000:00/9000:00:00.0/9000:01:00.0
-          template: ath9k_2
+          template: mt761x_2
           channel: 6
 
-        wifi_iface:
-        - ifname: labbmesh5
-          device: radio0
-          template: labbmesh
-          disabled: 0
+        - name: radio1
+          path: 'ffe0a000.pcie/pcia000:02/a000:02:00.0/a000:03:00.0+1'
+          template: mt761x_5
+          channel: auto
 
-        - ifname: labbmesh2
+        wifi_iface:
+        - ifname: labb2
+          device: radio0
+          template: labb
+
+        - ifname: labb5
           device: radio1
-          template: labbmesh
-          disabled: 1
+          template: labb
+
+        - ifname: vgo2
+          device: radio0
+          template: vgo2
+
+        - ifname: vgo5
+          device: radio1
+          template: vgo5