From 3e8c0e35d40d5a47a7e84e75979e17820dee8f76 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Mon, 26 Oct 2020 17:10:27 +0100
Subject: don't use main.yml inside group_vars

---
 inventory/group_vars/chaos-at-home-ap/main.yml | 48 --------------------------
 inventory/group_vars/chaos-at-home-ap/vars.yml | 48 ++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 48 deletions(-)
 delete mode 100644 inventory/group_vars/chaos-at-home-ap/main.yml
 create mode 100644 inventory/group_vars/chaos-at-home-ap/vars.yml

(limited to 'inventory/group_vars/chaos-at-home-ap')

diff --git a/inventory/group_vars/chaos-at-home-ap/main.yml b/inventory/group_vars/chaos-at-home-ap/main.yml
deleted file mode 100644
index eb05dfad..00000000
--- a/inventory/group_vars/chaos-at-home-ap/main.yml
+++ /dev/null
@@ -1,48 +0,0 @@
----
-network_mgmt_zone: "{{ network_zones.mgmt }}"
-
-accesspoint_wifi_channels:
-  2g4:
-    ch-ap0: 5
-    ch-ap1: 13
-  5g:
-    ch-ap0: 36
-    ch-ap1: 48
-
-accesspoint_zones:
-  lan: "{{ network_zones.lan.wifi }}"
-  iot: "{{ network_zones.iot.wifi }}"
-
-
-accesspoint_network_zones: "{{ accesspoint_network_zones_yaml | from_yaml }}"
-accesspoint_network_zones_yaml: |
-  {% for zone_name in accesspoint_zones.keys() %}
-  - name: "interface '{{ zone_name }}'"
-    options:
-      type: bridge
-      ifname: "{{ accesspoint_wired_interface }}.{{ network_zones[zone_name].vlan }}"
-      accept_ra: 0
-      proto: none
-  {% 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() %}
-  {%   for freq in accesspoint_wireless_frequencies %}
-  - name: wifi-iface '{{ zone }}{{ freq }}'
-    options:
-      device: 'radio{{ freq }}'
-      network: '{{ zone }}'
-      mode: 'ap'
-      disassoc_low_ack: '1'
-      rsn_preauth: '1'
-      ssid: '{{ accesspoint_zones[zone].ssid }}'
-      encryption: '{{ accesspoint_zones[zone].encryption }}'
-      key: '{{ accesspoint_zones[zone].key }}'
-  {%   endfor %}
-  {% endfor %}
-
diff --git a/inventory/group_vars/chaos-at-home-ap/vars.yml b/inventory/group_vars/chaos-at-home-ap/vars.yml
new file mode 100644
index 00000000..eb05dfad
--- /dev/null
+++ b/inventory/group_vars/chaos-at-home-ap/vars.yml
@@ -0,0 +1,48 @@
+---
+network_mgmt_zone: "{{ network_zones.mgmt }}"
+
+accesspoint_wifi_channels:
+  2g4:
+    ch-ap0: 5
+    ch-ap1: 13
+  5g:
+    ch-ap0: 36
+    ch-ap1: 48
+
+accesspoint_zones:
+  lan: "{{ network_zones.lan.wifi }}"
+  iot: "{{ network_zones.iot.wifi }}"
+
+
+accesspoint_network_zones: "{{ accesspoint_network_zones_yaml | from_yaml }}"
+accesspoint_network_zones_yaml: |
+  {% for zone_name in accesspoint_zones.keys() %}
+  - name: "interface '{{ zone_name }}'"
+    options:
+      type: bridge
+      ifname: "{{ accesspoint_wired_interface }}.{{ network_zones[zone_name].vlan }}"
+      accept_ra: 0
+      proto: none
+  {% 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() %}
+  {%   for freq in accesspoint_wireless_frequencies %}
+  - name: wifi-iface '{{ zone }}{{ freq }}'
+    options:
+      device: 'radio{{ freq }}'
+      network: '{{ zone }}'
+      mode: 'ap'
+      disassoc_low_ack: '1'
+      rsn_preauth: '1'
+      ssid: '{{ accesspoint_zones[zone].ssid }}'
+      encryption: '{{ accesspoint_zones[zone].encryption }}'
+      key: '{{ accesspoint_zones[zone].key }}'
+  {%   endfor %}
+  {% endfor %}
+
-- 
cgit v1.2.3