ansible-inventory

@@ -7,18 +7,15 @@ ap-c495 ip=10.84.1.34 location=tent-3          channel_2g=1  channel_5g=48
 ap-2bbf ip=10.84.1.30 location=tent-4          channel_2g=11 channel_5g=149
 ap-1a38 ip=10.84.1.35 location=tent-5          channel_2g=6  channel_5g=153
 ap-8f39 ip=10.84.1.37 location=tent-5          channel_2g=1  channel_5g=157
-
-ap-b62f ip=10.85.1.31 location=tent-1          channel_2g=1  channel_5g=36  txpower_2g=18 txpower_5g=19
-ap-b656 ip=10.85.1.35 location=tent-1          channel_2g=6  channel_5g=165 txpower_2g=18 txpower_5g=19
-ap-b6ee ip=10.85.1.32 location=office-security channel_2g=1  channel_5g=48  txpower_2g=12 txpower_5g=13
-ap-b5df ip=10.85.1.38 location=office-social   channel_2g=11 channel_5g=153 txpower_2g=12 txpower_5g=13
-ap-b6cb ip=10.85.1.33 location=office-facility channel_2g=6  channel_5g=60  txpower_2g=12 txpower_5g=13
-ap-b641 ip=10.85.1.30 location=tent-2          channel_2g=1  channel_5g=136 txpower_2g=18 txpower_5g=19
-ap-b6d7 ip=10.85.1.34 location=tent-2          channel_2g=6  channel_5g=104 txpower_2g=18 txpower_5g=19
-ap-b644 ip=10.85.1.36 location=tent-2          channel_2g=11 channel_5g=124 txpower_2g=18 txpower_5g=19
-ap-b634 ip=10.85.1.37 location=tent-3          channel_2g=1  channel_5g=116 txpower_2g=18 txpower_5g=19
-ap-b6cc ip=10.85.1.39 location=tent-3          channel_2g=6  channel_5g=40  txpower_2g=18 txpower_5g=19
-ap-b682 ip=10.85.1.40 location=tent-3          channel_2g=11 channel_5g=161 txpower_2g=18 txpower_5g=19
+ap-b62f ip=10.85.1.31 location=tent-1
+ap-b656 ip=10.85.1.35 location=tent-1
+ap-b6ee ip=10.85.1.32 location=office-security
+ap-b5df ip=10.85.1.38 location=office-social
+ap-b6cb ip=10.85.1.33 location=office-facility
+#ap-b641 ip=10.85.1.30 location=unknown
+#ap-b6d7 ip=10.85.1.34 location=unknown
+#ap-b644 ip=10.85.1.36 location=unknown
+#ap-b634 ip=10.85.1.37 location=unknown
 
 [accesspoints:vars]
 ansible_remote_tmp=/tmp
@@ -94,8 +91,6 @@ ap-b656
 ap-b644
 ap-b634
 ap-b5df
-ap-b682
-ap-b6cc
 ffl-ans-sw-distribution01
 ffl-ans-sw-access01
 ffl-ans-sw-access02
@@ -103,8 +98,7 @@ ffl-ans-sw-access02
 [site_ans:vars]
 wifi_ssid="GU Arno-Nitzsche-Strasse"
 wifi_encryption=none
-wifi_disabled=0
-backoffice_wifi_ssid="GU Arno-Nitzsche-Strasse BO"
+wifi_disabled=1
+backoffice_wifi_ssid="GU Arno-Nitzsche-Strasse Backoffice"
 backoffice_wifi_encryption=psk2
 backoffice_wifi_psk="{{ lookup('passwordstore', 'wifi/GU_Arno-Nitzsche-Straße_Backoffice') }}"
-mgmt_gateway=10.85.1.1

templates/accesspoints/etc/config/network

@@ -10,8 +10,8 @@ config interface 'mgmt'
         option proto 'static'
         option ipaddr '{{ ip }}'
         option netmask '255.255.255.0'
-        option gateway '{{ mgmt_gateway | default(10.84.1.1) }}'
-        list dns '{{ mgmt_gateway | default(10.84.1.1) }}'
+        option gateway '10.84.1.1'
+        list dns '10.84.1.1'
 
 config interface 'clients'
         option type 'bridge'

templates/accesspoints/etc/config/wireless

@@ -29,7 +29,7 @@ config wifi-iface 'backoffice_radio0'
         option ssid '{{ backoffice_wifi_ssid }}'
         option encryption '{{ backoffice_wifi_encryption }}'
         option key '{{ backoffice_wifi_psk }}'
-{% if not location | regex_search('office-.*') %}
+{% if location not in ['office-facility', 'office-social'] %}
         option disabled '1'
 {% endif %}
 
@@ -63,6 +63,6 @@ config wifi-iface 'backoffice_radio1'
         option ssid '{{ backoffice_wifi_ssid }}'
         option encryption '{{ backoffice_wifi_encryption }}'
         option key '{{ backoffice_wifi_psk }}'
-{% if not location | regex_search('office-.*') %}
+{% if location not in ['office-facility', 'office-social'] %}
         option disabled '1'
 {% endif %}