playbook: provision aps: cleanup

inventory

@@ -8,11 +8,6 @@ ap-1a38 ip=10.84.1.35
 ap-8f42 ip=10.84.1.36
 ap-8f39 ip=10.84.1.37
 
-[accesspoints:vars]
-wifi_ssid="eap-adp.freifunk-leipzig.de"
-wifi_encryption="psk2"
-wifi_psk="1234567890"
-
 [switches]
 sw-access01 ip=10.84.1.11 
 sw-access02 ip=10.84.1.12 

playbook_provision_accesspoints.yml

@@ -2,6 +2,10 @@
 - name: provision aps
   hosts: accesspoints
   gather_facts: no
+  vars:
+    - wifi_ssid: "eap-adp.freifunk-leipzig.de"
+    - wifi_encryption: "psk2"
+    - wifi_psk: "1234567890"
   tasks:
     - name: create clients bridge (vlan)
       blockinfile:
@@ -15,7 +19,7 @@
 
     - name: configure wireless
       template:
-        src: templates/wireless.j2
+        src: templates/aruba-ap-105_wireless.j2
         dest: /etc/config/wireless
       notify:
         - reload network

templates/aruba-ap-105_wireless.j2

@@ -17,7 +17,9 @@ config wifi-iface 'default_radio0'
         option mode 'ap'
         option ssid '{{ wifi_ssid }}'
         option encryption '{{ wifi_encryption }}'
+{% if wifi_psk is defined %}
         option key '{{ wifi_psk }}'
+{% endif %}
 
 config wifi-device 'radio1'
         option type 'mac80211'
@@ -37,4 +39,6 @@ config wifi-iface 'default_radio1'
         option mode 'ap'
         option ssid '{{ wifi_ssid }}'
         option encryption '{{ wifi_encryption }}'
+{% if wifi_psk is defined %}
         option key '{{ wifi_psk }}'
+{% endif %}