split out netplan

roles/network/tasks/main.yml

@@ -104,16 +104,23 @@
   tags:
     - network
 
+- name: Netplan in use on ubuntu 18
+  include_tasks: netplan.yml
+  when: is_ubuntu_18
+#and not installing
+  tags:
+    - network
+
 - name: NetworkManager in use (if ubuntu-18 and network_manager_active)
   include_tasks: NM-debian.yml
-  when: is_ubuntu_18 and network_manager_active
+  when: not is_ubuntu_18 and network_manager_active
 #and not installing
   tags:
     - network
 
 - name: systemd-networkd in use
   include_tasks: sysd-netd-debian.yml
-  when: is_debuntu and systemd_networkd_active
+  when: not is_ubuntu_18 and is_debuntu and systemd_networkd_active
 #and not installing
   tags:
     - network

roles/network/tasks/sysd-netd-debian.yml

@@ -20,13 +20,11 @@
 - name: Stopping services
   include_tasks: down-debian.yml
 
-- name: Disable and mask systemd-networkd-wait-online
+- name: Remove static WAN template
-  systemd:
+  file:
-    name: systemd-networkd-wait-online
+    state: absent
-    enabled: no
+    dest: /etc/systemd/network/IIAB-Static.network
-    masked: yes
+  when: wan_ip == "dhcp"
-    state: stopped
-  when: is_ubuntu_18
 
 - name: Static IP computing CIDR
   shell: netmask {{ wan_ip }}/{{ wan_netmask }} | awk -F "/" '{print $2}'
@@ -38,33 +36,11 @@
     wan_cidr: "{{ CIDR.stdout }}"
   when: wan_ip != "dhcp"
 
-- name: Figure out netplan file name on Ubuntu 18
-  shell: ls /etc/netplan
-  register: netplan
-  when: is_ubuntu_18
-
-# ICO will always set gui_static_wan_ip away from the default of 'unset' while
-# gui_static_wan turns dhcp on/off through wan_ip in computed_network and
-# overrides gui_static_wan_ip that is present. Changing wan_ip in local_vars
-# is a oneway street to static.
-- name: Supply static template
-  template:
-    dest:  /etc/netplan/{{ netplan.stdout }}
-    src: network/cloud-init.j2
-    backup: no
-  when: (wan_ip != "dhcp" or gui_static_wan_ip == "undefined") and is_ubuntu_18
-
-- name: Remove static WAN template
-  file:
-    state: absent
-    dest: /etc/systemd/network/IIAB-Static.network
-  when: wan_ip == "dhcp" and not is_ubuntu_18
-
 - name: Supply static WAN template
   template:
     dest: /etc/systemd/network/IIAB-Static.network
     src: network/systemd-static-net.j2
-  when: wan_ip != "dhcp" and not is_ubuntu_18
+  when: wan_ip != "dhcp"
 
 - name: Reload systemd
   systemd: