cleanup

roles/network/tasks/NM-debian.yml

@@ -3,7 +3,7 @@
   include_tasks: down-debian.yml
 
 # provide keyfile layout like the XO's used way back.
-- name: Create uuid for NM
+- name: Create uuid for NM's keyfile store
   shell: uuidgen
   register: uuid_response
 
@@ -12,7 +12,7 @@
     gen_uuid: "{{ uuid_response.stdout_lines[0] }}"
 
 # NM might have a watcher on this path and we don't have to restart NM
-- name: Copy the bridge script for has_NM
+- name: Copy the bridge script for NetworkManager
   template:
     dest: /etc/NetworkManager/system-connections/
     src: network/bridge-br0
@@ -20,7 +20,7 @@
 - name: Reload systemd
   shell: systemctl daemon-reload
 
-- name: Restart the networking service
+- name: Restart the NetworkManager service
   service:
     name: network-manager
     state: restarted

roles/network/tasks/rpi_debian.yml

@@ -43,7 +43,7 @@
     name: networking
     enabled: yes
     state: restarted
-  when: not nobridge is defined and not has_NM and not no_net_restart
+  when: not nobridge is defined and not no_net_restart
 
 - name: Restart hostapd when WiFi is present
   service: