Upgrade hAP AC2 and AC3 for DSA transition

althea-net · Feb 2, 2024 · e757efe · e757efe
1 parent 05c234e
commit e757efe
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 56 deletions.
diff --git a/profiles/devices/mikrotik_hap-ac2.yml b/profiles/devices/mikrotik_hap-ac2.yml
@@ -15,11 +15,11 @@ channel: 11
 five_ghz_channel: 36
 
 listen_interfaces:
-  - eth1
+  - wan
 
 # this device has a history of using low vlans and moving them around between
 # releases because of that we've moved our own vlans up to 10+ and set it up
 # such that port eth0.11 -> the switch (eth0) and port 1 (vlan 11 = 10 + port number 1)
-lan_interfaces: "eth0.11 eth0.12 eth0.13 eth0.14"
+lan_interfaces: "lan1 lan2 lan3 lan4"
 
 rust_target: armv7-unknown-linux-musleabihf
diff --git a/profiles/devices/mikrotik_hap-ac3.yml b/profiles/devices/mikrotik_hap-ac3.yml
@@ -15,12 +15,12 @@ channel: 11
 five_ghz_channel: 36
 
 listen_interfaces:
-  - eth1
+  - wan
 
 # this device has a history of using low vlans and moving them around between
 # releases because of that we've moved our own vlans up to 10+ and set it up
 # such that port eth0.11 -> the switch (eth0) and port 1 (vlan 11 = 10 + port number 1)
-lan_interfaces: "eth0.11 eth0.12 eth0.13 eth0.14"
+lan_interfaces: "lan1 lan2 lan3 lan4"
 
 
 rust_target: armv7-unknown-linux-musleabihf
diff --git a/roles/build-config/templates/mikrotik_hap-ac2-network.j2 b/roles/build-config/templates/mikrotik_hap-ac2-network.j2
@@ -6,29 +6,3 @@ config interface 'rita_{{interface | replace(".","")}}'
         option ifname {{interface}}
         option proto static
 {% endfor %}
-
-config switch
-	option name 'switch0'
-	option reset '1'
-	option enable_vlan '1'
-
-# you can't use vlan 1 on this device, so we put port 1 on vlan 5
-config switch_vlan
-	option device 'switch0'
-	option vlan '11'
-	option ports '1 0t'
-
-config switch_vlan
-	option device 'switch0'
-	option vlan '12'
-	option ports '2 0t'
-
-config switch_vlan
-	option device 'switch0'
-	option vlan '13'
-	option ports '3 0t'
-
-config switch_vlan
-	option device 'switch0'
-	option vlan '14'
-	option ports '4 0t'
diff --git a/roles/build-config/templates/mikrotik_hap-ac3-network.j2 b/roles/build-config/templates/mikrotik_hap-ac3-network.j2
@@ -6,29 +6,3 @@ config interface 'rita_{{interface | replace(".","")}}'
         option ifname {{interface}}
         option proto static
 {% endfor %}
-
-config switch
-	option name 'switch0'
-	option reset '1'
-	option enable_vlan '1'
-
-# you can't use vlan 1 on this device, so we put port 1 on vlan 5
-config switch_vlan
-	option device 'switch0'
-	option vlan '11'
-	option ports '1 0t'
-
-config switch_vlan
-	option device 'switch0'
-	option vlan '12'
-	option ports '2 0t'
-
-config switch_vlan
-	option device 'switch0'
-	option vlan '13'
-	option ports '3 0t'
-
-config switch_vlan
-	option device 'switch0'
-	option vlan '14'
-	option ports '4 0t'