provide NetworkManager.conf - and move prior to daemon-reload

roles/network/tasks/debian.yml

@@ -57,6 +57,20 @@
   service: name=dnsmasq state=stopped
   when: dnsmasq_install
 
+# do this
+- name: Copy NetworkManager.conf for has_NM
+  template: dest=/etc/NetworkManager/NetworkManager.conf
+            src=network/NetworkManager.conf
+  when: has_NM and iiab_lan_iface == "br0"
+
+# NM might have a watcher on this path and we don't have to restart NM
+- name: Copy the bridge script for has_NM
+  template: dest=/etc/network/interfaces
+            src=network/systemd.j2
+  when: has_NM and iiab_lan_iface == "br0"
+
+# or provide keyfile layout like the XO's used way back.
+
 - name: Reload systemd
   shell: systemctl daemon-reload
 
@@ -69,12 +83,6 @@
   service: name=networking  state=restarted
   when: not nobridge is defined and not has_NM and not no_net_restart
   
-# NM might have a watcher on this path and we don't have to restart NM
-- name: Copy the bridge script for has_NM
-  template: dest=/etc/network/interfaces
-            src=network/systemd.j2
-  when: has_NM and iiab_lan_iface == "br0"
-
 - name: Restart hostapd when WiFi is present
   service: name=hostapd state=restarted
   when: iiab_wireless_lan_iface is defined and hostapd_enabled and iiab_network_mode != "Appliance"

roles/network/templates/network/NetworkManager.conf

@@ -0,0 +1,8 @@
+[main]
+plugins=ifupdown,keyfile
+
+[ifupdown]
+managed=true
+
+[device]
+wifi.scan-rand-mac-address=no