FULL/PATH to netplan.yml & netwarn.yml for 1-prep

roles/network/tasks/install.yml

@@ -81,12 +81,12 @@
 
 # LESS MAINTAINED
 - name: Install Squid
-  include_tasks: roles/network/tasks/squid.yml
+  include_tasks: roles/network/tasks/squid.yml    # Invoked by 1-prep (so full path needed)
   when: squid_install and squid_installed is undefined
 
   #preprep for backends
 - name: Netplan in use on Ubuntu 18.04+
-  include_tasks: netplan.yml
+  include_tasks: roles/network/tasks/netplan.yml    # Invoked by 1-prep (so full path needed)
   when: is_ubuntu
 
 # all installs
@@ -100,7 +100,7 @@
     - gateway/iiab-internet-off
 
 - name: 'Install /usr/local/sbin/netwarn for pop-ups on boot, if iiab-network should be run'
-  include_tasks: netwarn.yml
+  include_tasks: roles/network/tasks/netwarn.yml    # Invoked by 1-prep (so full path needed)
 
 
 # RECORD Network AS INSTALLED

roles/network/tasks/main.yml

@@ -43,21 +43,24 @@
 
 - name: Configuring Network if enabled
   block:
-  # - name: Configure wondershaper
-  #   include_tasks: wondershaper.yml
-  #   when: wondershaper_install or wondershaper_installed is defined
 
-#  - name: (Re)Install named
-#    include_tasks: named.yml
-#    when: named_install and FQDN_changed and iiab_stage|int == 9
+  # DEPRECATED
+  #- name: Configure wondershaper
+  #  include_tasks: wondershaper.yml
+  #  when: wondershaper_install or wondershaper_installed is defined
+  #
+  #- name: (Re)Install named
+  #  include_tasks: named.yml
+  #  when: named_install and FQDN_changed and iiab_stage|int == 9
+  #
+  #- name: (Re)Install dhcpd
+  #  include_tasks: dhcpd.yml
+  #  when: dhcpd_install and FQDN_changed and iiab_stage|int == 9
 
-#  - name: (Re)Install dhcpd
-#    include_tasks: dhcpd.yml
-#    when: dhcpd_install and FQDN_changed and iiab_stage|int == 9
-
-#  - name: (Re)Install Squid
-#    include_tasks: squid.yml
-#    when: squid_install and FQDN_changed and iiab_stage|int == 9
+  # 2022-07-22: Is './runrole --reinstall network' the new way to make this run?
+  #- name: (Re)Install Squid
+  #  include_tasks: squid.yml
+  #  when: squid_install and FQDN_changed and iiab_stage|int == 9
 
   #### Start services
   - name: hostapd
@@ -92,6 +95,7 @@
 
   - name: Restart services
     include_tasks: restart.yml
+
   # end block
   when: network_installed is defined and network_enabled