diff options
Diffstat (limited to 'inventory')
-rw-r--r-- | inventory/group_vars/accesspoints/vars.yml | 13 | ||||
-rw-r--r-- | inventory/group_vars/chaos-at-home-ap/vars.yml | 14 |
2 files changed, 4 insertions, 23 deletions
diff --git a/inventory/group_vars/accesspoints/vars.yml b/inventory/group_vars/accesspoints/vars.yml index 3a11205c..3d9a8be2 100644 --- a/inventory/group_vars/accesspoints/vars.yml +++ b/inventory/group_vars/accesspoints/vars.yml @@ -106,17 +106,8 @@ accesspoint_wireless_ifaces_yaml: | {% if accesspoint_80211r is defined %} ieee80211r: '1' mobility_domain: '{{ '%04x' % (accesspoint_80211r.mobility_domain_base[band] + outer_loop.index0) }}' - nasid: '{{ accesspoint_wifi_mac_addr[band][inventory_hostname] | replace(':', '') }}' - ft_psk_generate_local: '0' - r1_key_holder: '{{ accesspoint_wifi_mac_addr[band][inventory_hostname] }}' - r0kh: - {% for ap in accesspoint_wifi_mac_addr[band] %} - - '{{ accesspoint_wifi_mac_addr[band][ap] }},{{ accesspoint_wifi_mac_addr[band][ap] | replace(':', '') }},{{ [accesspoint_80211r.key_seed,band,zone] | join(':') | wifi_80211r_key }}' - {% endfor %} - r1kh: - {% for ap in accesspoint_wifi_mac_addr[band] %} - - '{{ accesspoint_wifi_mac_addr[band][ap] }},{{ accesspoint_wifi_mac_addr[band][ap] }},{{ [accesspoint_80211r.key_seed,band,zone] | join(':') | wifi_80211r_key }}' - {% endfor %} + ft_over_ds: '1' + ft_psk_generate_local: '1' {% endif %} {% endfor %} {% endfor %} diff --git a/inventory/group_vars/chaos-at-home-ap/vars.yml b/inventory/group_vars/chaos-at-home-ap/vars.yml index c36ab953..1d613617 100644 --- a/inventory/group_vars/chaos-at-home-ap/vars.yml +++ b/inventory/group_vars/chaos-at-home-ap/vars.yml @@ -10,20 +10,10 @@ accesspoint_wifi_channels: ch-ap1: 48 ch-ap2: 40 -accesspoint_wifi_mac_addr: - 2g: - ch-ap0: 18:e8:29:aa:43:c2 - ch-ap1: 18:e8:29:aa:44:07 - 5g: - ch-ap0: 18:e8:29:ab:43:c2 - ch-ap1: 18:e8:29:ab:44:07 - ch-ap2: 80:2a:a8:ee:f6:d5 - accesspoint_80211r: mobility_domain_base: - 2g: 0x2400 - 5g: 0x5000 - key_seed: "{{ vault_accesspoint_80211r.key_seed }}" + 2g: 0xc240 + 5g: 0xc500 accesspoint_zones: |