PR #3173 adjustments (making network role optional)

roles/1-prep/tasks/main.yml

@@ -3,10 +3,6 @@
 - name: ...IS BEGINNING ============================================
   meta: noop
 
-- name: Install network/wifi related packages -- configure LATER in 'network', after Stage 9
-  include_tasks: roles/network/tasks/install.yml
-  when: network_install
-
 - name: SSHD -- required by OpenVPN below -- also run by roles/4-server-options/tasks/main.yml
   include_role:
     name: sshd
@@ -33,6 +29,10 @@
     dest: /usr/bin/
     mode: '0755'
 
+- name: Install ~12 network/wifi/related packages + Squid if necessary + configure /etc/sysctl.conf -- full configuration LATER in 'network', after Stage 9
+  include_tasks: roles/network/tasks/install.yml
+  when: network_install
+
 - include_tasks: uuid.yml
 - include_tasks: ubermix.yml
 

roles/network/tasks/install.yml

@@ -19,7 +19,7 @@
 # total download size) and they can help IIAB field operators with BOTH
 # (1) internal WiFi AND (2) USB WiFi devices inserted anytime/later.
 
-- name: 'Install 11 network packages: avahi-daemon, hostapd, iproute2, iptables-persistent, iw, libnss-mdns, netmask, net-tools, rfkill, wpasupplicant, wpasupplicant -- later used by https://github.com/iiab/iiab/tree/master/roles/network'
+- name: 'Install 11 network packages: avahi-daemon, hostapd, iproute2, iptables-persistent, iw, libnss-mdns, netmask, net-tools, rfkill, wireless-tools, wpasupplicant -- later used by https://github.com/iiab/iiab/tree/master/roles/network'
   package:
     name:
       - avahi-daemon           #   97kB download: RasPiOS (and package libnss-mnds, below) install this regardless -- holdover from the XO days and used to advertise ssh/admin-console being available via avahi-daemon -- used with https://github.com/iiab/iiab/blob/master/roles/network/tasks/avahi.yml
@@ -60,15 +60,6 @@
     #- { name: 'net.ipv6.conf.default.disable_ipv6', value: '1' }    # AUTO-SET
     #- { name: 'net.ipv6.conf.lo.disable_ipv6', value: '1' }         # BY ABOVE
 
-- name: "Set 'network_installed: True'"
-  set_fact:
-    network_installed: True
-
-- name: "Add 'network_installed: True' to {{ iiab_state_file }}"
-  lineinfile:
-    path: "{{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
-    regexp: '^network_installed'
-    line: 'network_installed: True'
 
 # UNMAINTAINED
 - name: Install named / BIND
@@ -84,3 +75,14 @@
 - name: Install Squid
   include_tasks: roles/network/tasks/squid.yml
   when: squid_install and squid_installed is undefined
+
+
+- name: "Set 'network_installed: True'"
+  set_fact:
+    network_installed: True
+
+- name: "Add 'network_installed: True' to {{ iiab_state_file }}"
+  lineinfile:
+    path: "{{ iiab_state_file }}"    # /etc/iiab/iiab_state.yml
+    regexp: '^network_installed'
+    line: 'network_installed: True'