Merge pull request #1829 from jvonau/wan_file

Wan file

roles/network/tasks/detected_network.yml

@@ -46,7 +46,7 @@
 - name: Setting wan_in_interfaces
   set_fact:
     wan_in_interfaces: True
-  when: is_debuntu and wan_file.stdout|int >= "0"
+  when: is_debuntu and (wan_file.stdout|int > 0)
 
 # WIRELESS -- if any wireless is detected as gateway, it becomes WAN
 - name: Look for any wireless interfaces

roles/network/tasks/restart.yml

@@ -53,7 +53,7 @@
     creates: /etc/sysconfig/olpc-scripts/setup.d/installed/gateway
   when: iiab_network_mode == "Gateway"
 
-- name: Waiting {{ hostapd_wait }} seconds for network to stabilize (iiap-gen-iptables will fail if dnsmasq isn't ready!)
+- name: Waiting {{ hostapd_wait }} seconds for network to stabilize (dnsmasq will fail if br0 isn't in a 'up' state!)
   shell: sleep {{ hostapd_wait }}
 
 - name: Run /usr/bin/iiab-gen-iptables
@@ -70,7 +70,7 @@
     state: restarted
   when: hostapd_enabled and wifi_slave.stdout is defined and wifi_slave.stdout == 0
 
-- name: dhcp_server may be affected - starting - user choice
+- name: User choice of dnsmasq or dhcpd - restarting {{ dhcp_service2 }}
   systemd:
     name: "{{ dhcp_service2 }}"
     state: restarted