From 05600f3b7af7415c566ba167c4fd288dcfd71726 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Sat, 12 Sep 2020 02:33:31 +0100 Subject: [PATCH] detect secondary gateway on wifi interface for no_net_restart --- roles/network/tasks/detected_network.yml | 9 +++++++++ roles/network/tasks/main.yml | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/roles/network/tasks/detected_network.yml b/roles/network/tasks/detected_network.yml index c6d73192f..5b1691ceb 100644 --- a/roles/network/tasks/detected_network.yml +++ b/roles/network/tasks/detected_network.yml @@ -145,6 +145,15 @@ with_items: - "{{ lan_list_result.stdout_lines }}" +- name: Detect wifi gateway active + shell: ip r | grep default | grep {{ discovered_wireless_iface }} | wc -l + when: discovered_wireless_iface != "none" + register: wifi_gateway_found + +- name: Set has_wifi_gateway for {{ discovered_wireless_iface }} if gateway is detected + set_fact: + has_wifi_gateway: True + when: wifi_gateway_found is defined and (wifi_gateway_found.stdout|int > 0) - name: Set iiab_wireless_lan_iface to {{ discovered_wireless_iface }} if not none set_fact: diff --git a/roles/network/tasks/main.yml b/roles/network/tasks/main.yml index 35bd3c66d..356cb2e6a 100644 --- a/roles/network/tasks/main.yml +++ b/roles/network/tasks/main.yml @@ -12,7 +12,7 @@ # 0-init/defaults/main.yml, network/tasks/main.yml, debian.yml, # detected_network.yml, down-debian.yml, NM-debian.yml, restart.yml, # sysd-netd-debian.yml, computed_services.yml, rpi_debian.yml - when: discovered_wireless_iface == iiab_wan_iface + when: has_wifi_gateway is defined - name: computed_network include_tasks: computed_network.yml