netplan - need to start netplan-wpa@ after hostapd

roles/network/tasks/detected_network.yml

@@ -15,9 +15,11 @@
     device_gw: "{{ discovered_wan_iface }}"
   when: ansible_default_ipv4.gateway is defined
 
-#- name: Red Hat network detection (redhat)
+- name: Figure out netplan file name
-#  include_tasks: detected_redhat.yml
+  shell: ls /etc/netplan
-#  when: is_redhat | bool
+  register: netplan
+  ignore_errors: True # pre 17.10 doesn't use netplan
+  when: is_ubuntu
 
 - name: Setting dhcpcd_test results
   set_fact:

roles/network/tasks/netplan.yml

@@ -1,7 +1,3 @@
-- name: Figure out netplan file name
-  shell: ls /etc/netplan
-  register: netplan
-
 - name: Disable cloud-init the easy way
   shell: touch /etc/cloud/cloud-init.disabled
   when: ("item" == "50-cloud-init.yaml")

roles/network/templates/hostapd/hostapd.service.j2

@@ -7,6 +7,9 @@ Before=dhcpcd.service
 {% endif %}
 Before=wpa_supplicant.service
 Before=wpa_supplicant@{{ discovered_wireless_iface }}.service
+{% if netplan.stdout.find("yaml") != -1 %}
+Before=netplan-wpa@{{ discovered_wireless_iface }}
+{% endif %}
 Before=network.target
 
 [Service]