imageprofile: invert the conditional_packages logic

Author: pktpls

group_vars/all/imageprofile.yml

@@ -12,18 +12,19 @@ imagebuilder_filename: "openwrt-imagebuilder-{{ openwrt_version }}-{{ target | r
 imagebuilder: "{{ openwrt_mirror }}/{{ openwrt_base }}/targets/{{ target }}/{{ imagebuilder_filename }}"
 feed: "src/gz openwrt_falter https://firmware.berlin.freifunk.net/feed/{{ feed_version }}/packages/__INSTR_SET__/falter"
 
+# The packages list is spread over a number of lists for two reasons:
+# 1. Individual locations want to override particular packages
+#    without dealing with the complete packages list.
+# 2. We want to omit certain packages based on device properties or config,
+#    e.g. devices with low ram / low flash, or with or without tunspace uplink.
+
 all__packages__to_merge:
-  - ethtool
   - ip6tables-nft # Its not pulled in by default anymore bc fw4
   - iptables-nft
-  - iperf3
-  - iwinfo
   - ip
   - kmod-nft-bridge
   - mtr
   - nftables
-  - tcpdump-mini
-  - vnstat
   - -ppp
   - -ppp-mod-pppoe
 
@@ -46,5 +47,47 @@ all_collectd__packages__to_merge:
   - collectd-mod-ping
   - collectd-mod-uptime
 
-all__disabled_services__to_merge:
-  - "olsrd6"
+multicore__packages__to_merge:
+  - irqbalance
+
+# Will be removed unless wifi_roaming
+dawn__packages__to_merge:
+  - dawn
+  - luci-app-dawn
+  - umdns
+
+# Will be removed unless it's a device with DSA switch driver
+dsa__packages__to_merge:
+  - ip-bridge
+
+zram__packages__to_merge:
+  - zram-swap
+
+notlow__packages__to_merge:
+  - ethtool
+  - iperf3
+  - iwinfo
+  - libiwinfo-lua
+  - collectd-mod-iwinfo
+  - tcpdump
+  - vnstat
+
+low__packages__to_merge:
+  - tcpdump-mini
+  - -opkg
+  - -kmod-ipt-core
+  - -kmod-ipt-offload
+  - -kmod-nf-ipt
+  - -kmod-nls-base
+  - -kmod-phy-ath79-usb
+  - -kmod-usb-core
+  - -kmod-usb-ehci
+  - -kmod-usb-ohci
+  - -kmod-usb2
+
+qos__packages__to_merge:
+  - qos-scripts
+
+# This will be overridden unless low_mem
+low__disabled_services__to_merge:
+  - uhttpd

group_vars/role_corerouter/imageprofile.yml

@@ -29,3 +29,18 @@ collectd__packages__to_merge:
 bird__packages__to_merge:
   - bird2-babelpatch
   - bird2c
+
+tunnel__packages__to_merge:
+  - tunspace
+  - wireguard-tools
+
+dfs__packages__to_merge:
+  - airos-dfs-reset
+
+util__packages__to_merge:
+  - mosh-server
+  - tmux
+
+# There's no way to install only olsrd without olsrd6
+all__disabled_services__to_merge:
+  - "olsrd6"

roles/cfg_openwrt/tasks/conditional_packages.yml

@@ -1,97 +1,70 @@
 ---
-- name: "Add irqbalance if multicore"
+
+- name: "Omit irqbalance unless multicore"
   set_fact:
-    packages: "{{ packages + ['irqbalance'] }}"
+    multicore__packages__to_merge: []
   when:
-    - multicore|default(false)|bool
+    - not (multicore | default(false))
 
-- name: "Add airos-dfs-reset if configured"
+- name: "Omit airos-dfs-reset unless configured"
   set_fact:
-    packages: "{{ packages + ['airos-dfs-reset'] }}"
+    dfs__packages__to_merge: []
   when:
-    - airos_dfs_reset|default([])|length > 0
-    - role == 'corerouter'
+    - not (airos_dfs_reset | default([]) | count > 1)
 
-- name: "Add Dawn + Luci app for corerouters"
+- name: "Omit DAWN unless configured"
   set_fact:
-    packages: "{{ packages + [item] }}"
+    dawn__packages__to_merge: []
   when:
-    - role == 'corerouter' or role == 'ap'
-    - not (low_mem | default(false))
-    - not (low_flash | default(false))
-    - wifi_roaming | default(false)
-  loop:
-    - dawn
-    - luci-app-dawn
-    - umdns
+    - not (wifi_roaming | default(false))
 
-- name: "Add tunspace if configured"
+- name: "Omit tunspace unless configured"
   set_fact:
-    packages: "{{ packages + ['tunspace', 'wireguard-tools'] }}"
+    tunnel__packages__to_merge: []
   when:
-    - networks is defined
-    - networks | selectattr('role', 'defined') | selectattr('role','equalto','tunnel') | count > 0
-    - role == 'corerouter'
+    - networks is not defined or networks | selectattr('role','equalto','tunnel') | count == 0
 
-- name: "Add zram-swap on low mem and big flash"
+- name: "Omit zram-swap unless low mem and big flash"
   set_fact:
-    packages: "{{ packages + ['zram-swap'] }}"
+    zram__packages__to_merge: []
   when:
-    - low_mem | default(false)
-    - not (low_flash | default(false))
+    # CONFIG_KERNEL_SWAP is disabled on many low_flash devices (citation needed)
+    - not (low_mem | default(false) and not (low_flash | default(false)))
 
-- name: "Add debugging-packages on core-routers"
+- name: "Omit corerouter utilities if low mem or low flash"
   set_fact:
-    packages: "{{ packages + ['mosh-server', 'tmux'] }}"
+    util__packages__to_merge: []
   when:
-    - role == 'corerouter'
-    - not (low_mem | default(false))
-    - not (low_flash | default(false))
+    - low_mem | default(false) or low_flash | default(false)
 
-- name: "Remove or replace packages on low mem and low flash"
+- name: "Omit notlow packages if low mem or low flash"
   set_fact:
-    packages: "{{ packages + [item] }}"
+    notlow__packages__to_merge: []
   when: low_mem | default(false) or low_flash | default(false)
-  loop:
-    - -ethtool
-    - -iperf3
-    - -iwinfo
-    - -libiwinfo-lua
-    - -collectd-mod-iwinfo
-    - -kmod-ipt-core
-    - -kmod-ipt-offload
-    - -kmod-nf-ipt
-    - -kmod-nls-base
-    - -kmod-phy-ath79-usb
-    - -kmod-usb-core
-    - -kmod-usb-ehci
-    - -kmod-usb-ohci
-    - -kmod-usb2
-    - -opkg
-    - -tcpdump
-    - tcpdump-mini
-    - -vnstat
 
-- name: "Remove Luci on low mem and low flash"
+- name: "Omit low packages unless low mem or low flash"
+  set_fact:
+    low__packages__to_merge: []
+  when: not (low_mem | default(false) or low_flash | default(false))
+
+- name: "Omit LuCI if low mem or low flash unless corerouter"
   set_fact:
-    packages: "{{ packages + ['-' + item] }}"
+    all_luci_base__packages__to_merge: []
   when: (low_mem | default(false) or low_flash | default(false)) and role != "corerouter"
-  loop: "{{ all_luci_base__packages__to_merge }}"
 
-- name: "Disable uhttpd on low mem"
+- name: "Skip disabling uhttpd unless low mem"
   set_fact:
-    disabled_services: "{{ disabled_services + ['uhttpd'] }}"
-  when: low_mem | default(false)
+    low__disabled_services__to_merge: []
+  when: not (low_mem | default(false))
 
-- name: "Add ip-bridge if dsa target"
+- name: "Omit ip-bridge unless DSA target"
   set_fact:
-    packages: "{{ packages + ['ip-bridge'] }}"
+    dsa__packages__to_merge: []
   when:
-    - dsa_ports is defined
+    - not (dsa_ports is defined)
 
 - name: "Add QOS support if configured"
   set_fact:
-    packages: "{{ packages + ['qos-scripts'] }}"
+    qos__packages__to_merge: []
   when:
-    - networks is defined
-    - networks | selectattr('ingress', 'defined') | count > 0 or networks | selectattr('egress', 'defined') | count > 0
+    - networks is not defined or networks | selectattr('ingress', 'defined') | count == 0 or networks | selectattr('egress', 'defined') | count == 0

roles/cfg_openwrt/tasks/main.yml

@@ -1,14 +1,14 @@
 ---
-- name: Include tasks for merging variables
+- name: Include tasks for conditional packages
   include_tasks:
-    file: merge_vars.yml
+    file: conditional_packages.yml
     apply:
       tags: always
   tags: always
 
-- name: Include tasks for conditional packages
+- name: Include tasks for merging variables
   include_tasks:
-    file: conditional_packages.yml
+    file: merge_vars.yml
     apply:
       tags: always
   tags: always