accespoint/roaming: add usteer

2 files changed, 34 insertions, 17 deletions

diff --git a/inventory/group_vars/accesspoints/vars.yml b/inventory/group_vars/accesspoints/vars.yml
index af4a111e..14d881d5 100644
--- a/inventory/group_vars/accesspoints/vars.yml
+++ b/inventory/group_vars/accesspoints/vars.yml
@@ -85,9 +85,6 @@ accesspoint_wireless_devices_yaml: |
   {% endfor %}
 
 
-## TODO: set up 802.11r see:
-##        * https://www.reddit.com/r/openwrt/comments/515oea/finally_got_80211r_roaming_working/
-##        * https://gist.github.com/lg/998d3e908d547bd9972a6bb604df377b
 accesspoint_wireless_ifaces: "{{ accesspoint_wireless_ifaces_yaml | from_yaml }}"
 accesspoint_wireless_ifaces_yaml: |
   {% for zone in accesspoint_zones.keys() %}
@@ -164,6 +161,8 @@ _accesspoint_band_steering_packages_extra_:
   none: []
   dawn:
   - dawn
+  usteer:
+  - usteer
 
 openwrt_packages_extra: "{{ _accesspoint_band_steering_packages_extra_[accesspoint_band_steering.kind | default('none')] }}"
 
@@ -306,7 +305,7 @@ openwrt_mixin:
       exit 0
 
 
-openwrt_uci:
+openwrt_uci_base:
   system:
     - name: system
       options:
@@ -354,15 +353,33 @@ openwrt_uci:
   network: "{{ accesspoint_network_base + accesspoint_network_zones }}"
   wireless: "{{ accesspoint_wireless_devices + accesspoint_wireless_ifaces }}"
 
-## TODO: band_steering
-#  umdns:
-#    - name: umds
-#      options:
-#        jail: '1'
-#        network:
-#        - mgmt
-#
-#  dawn:
-#    - name: network
-#      options:
-#        broadcast_ip: '{{ network_mgmt_zone.prefix | ansible.utils.ipaddr('broadcast') }}"
+openwrt_uci_band_steering: "{{ openwrt_uci_band_steering_yaml | from_yaml }}"
+openwrt_uci_band_steering_yaml: |
+  {% if accesspoint_band_steering is defined %}
+  {%   if accesspoint_band_steering.kind == 'dawn' %}
+  umdns:
+    - name: umds
+      options:
+        jail: '1'
+        network:
+        - mgmt
+
+  ## TODO: what are the minimal required settings here??
+  dawn:
+    - name: network
+      options:
+        broadcast_ip: '{{ network_mgmt_zone.prefix | ansible.utils.ipaddr("broadcast") }}'
+  {%   elif accesspoint_band_steering.kind == 'usteer' %}
+  usteer:
+    - name: usteer
+      options:
+        network: 'mgmt'
+        syslog: '1'
+        local_mode: '0'
+        ipv6: '0'
+        debug_level: '3'
+  {%   endif %}
+  {% endif %}
+
+
+openwrt_uci: "{{ openwrt_uci_base | combine(accesspoint_band_steering is defined | ternary(openwrt_uci_band_steering, {})) }}"
diff --git a/inventory/group_vars/chaos-at-home-ap/vars.yml b/inventory/group_vars/chaos-at-home-ap/vars.yml
index b9d83e90..f5502845 100644
--- a/inventory/group_vars/chaos-at-home-ap/vars.yml
+++ b/inventory/group_vars/chaos-at-home-ap/vars.yml
@@ -16,7 +16,7 @@ accesspoint_80211r:
     5g: 0xc500
 
 accesspoint_band_steering:
-  kind: dawn
+  kind: usteer
 
 
 accesspoint_zones: