From ebae3606465da6c0dbec5ffd22500a0f98c8cf2e Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Wed, 29 Jun 2022 22:48:14 -0500 Subject: [PATCH] network - drop internet_available --- roles/network/defaults/main.yml | 6 ++---- roles/network/tasks/netplan.yml | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/roles/network/defaults/main.yml b/roles/network/defaults/main.yml index 6938f4a43..fd1fa4dcc 100644 --- a/roles/network/defaults/main.yml +++ b/roles/network/defaults/main.yml @@ -27,9 +27,6 @@ # hostapd_enabled: True # Above set in /opt/iiab/iiab/vars/default_vars.yml -# 2022-06-29: Legacy vars no longer used by roles/0-init -gw_active: False # 2021-07-30: Not used propgrammatically -discovered_wan_iface: none # 2021-07-30: Very broadly used! hostapd_wait: 10 host_wireless_n: False @@ -67,7 +64,8 @@ can_be_ap: False exclude_devices: none device_gw: none prior_gw_device: unset - +# 2022-06-29: Legacy vars no longer used by roles/0-init +discovered_wan_iface: none # 2021-07-30: Very broadly used! iiab_wan_iface: none iiab_lan_iface: none discovered_lan_iface: none diff --git a/roles/network/tasks/netplan.yml b/roles/network/tasks/netplan.yml index 799af001d..136b1df09 100644 --- a/roles/network/tasks/netplan.yml +++ b/roles/network/tasks/netplan.yml @@ -64,7 +64,7 @@ url: https://gitlab.com/craftyguy/networkd-dispatcher/-/raw/2.1/networkd-dispatcher dest: /usr/bin/networkd-dispatcher timeout: "{{ download_timeout }}" - when: internet_available and fix_dispatcher and ansible_distribution_release == "groovy" + when: iiab_stage|int < 9 and fix_dispatcher and ansible_distribution_release == "groovy" # 2021-08-29 context from @jvonau: Fix is 'Groovy' specific, 21.04 and later # should have the fix baked into a newer apt package installed by default.