Merge pull request #237 from iiab/master

sync from iiab/iiab

roles/network/tasks/main.yml

@@ -100,42 +100,43 @@
 - name: Redhat networking
   include_tasks: ifcfg_mods.yml
   when: is_redhat
-#and not installing
+  #and not installing
   tags:
     - network
 
-- name: Netplan in use on Ubuntu 18
+- name: Netplan in use on Ubuntu 18.04+
   include_tasks: netplan.yml
-  when: is_ubuntu_18
-#and not installing
+  when: is_ubuntu and not is_ubuntu_16
+  #when: is_ubuntu_18
+  #and not installing
   tags:
     - network
 
 - name: NetworkManager in use
   include_tasks: NM-debian.yml
   when: is_debuntu and network_manager_active
-#and not installing
+  #and not installing
   tags:
     - network
 
 - name: systemd-networkd in use
   include_tasks: sysd-netd-debian.yml
   when: is_debuntu and systemd_networkd_active
-#and not installing
+  #and not installing
   tags:
     - network
 
 - name: RPi's have dhcpcd in use
   include_tasks: rpi_debian.yml
   when: is_debuntu and is_rpi
-#and not installing
+  #and not installing
   tags:
     - network
 
 - name: Not RPi, Not NetworkManager, Not systemd-networkd in use
   include_tasks: debian.yml
   when: (not is_rpi and not network_manager_active and not systemd_networkd_active and is_debuntu) or is_ubuntu_16
-#and not installing
+  #and not installing
   tags:
     - network
 

roles/network/tasks/netplan.yml

@@ -1,5 +1,4 @@
-# netplan.yml
-- name: Figure out netplan file name on Ubuntu 18
+- name: Figure out netplan file name
   shell: ls /etc/netplan
   register: netplan
 
@@ -12,7 +11,7 @@
 - name: Remove stock netplan template
   file:
     state: absent
-    dest: /etc/netplan/{{ item }}
+    path: /etc/netplan/{{ item }}
   with_items:
     - "{{ netplan.stdout_lines }}"
   when: netplan.stdout.find("yaml") != -1