From 46448daeab9c53e89ff9ebdcf806db3c0c28a346 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Wed, 7 Oct 2020 13:59:16 -0500 Subject: [PATCH 1/2] replace second_gateway_found.changed with second_gateway_found.stdout != and wording --- roles/network/tasks/detected_network.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/roles/network/tasks/detected_network.yml b/roles/network/tasks/detected_network.yml index 6f744398a..5a9c9ee79 100644 --- a/roles/network/tasks/detected_network.yml +++ b/roles/network/tasks/detected_network.yml @@ -106,19 +106,20 @@ register: wifi_gateway_found when: discovered_wireless_iface != "none" -- name: Set has_wifi_gateway for {{ discovered_wireless_iface }} if WiFi gateway is detected +- name: Set has_wifi_gateway for {{ discovered_wireless_iface }} when WiFi gateway has been detected set_fact: has_wifi_gateway: True when: discovered_wireless_iface != "none" and (wifi_gateway_found.stdout|int > 0) -- name: Detect secondary gateway active +- name: Detect secondary gateway active on all interfaces shell: ip r | grep default | grep -v {{ discovered_wan_iface }} | awk '{print $5}' register: second_gateway_found + changed_when: False -- name: Set exclude_devices for {{ second_gateway_found.stdout }} if gateway is detected +- name: Set exclude_devices if default gateway has been detected for {{ second_gateway_found.stdout }} set_fact: exclude_devices: "-e {{ second_gateway_found.stdout }}" - when: second_gateway_found.changed + when: second_gateway_found.stdout != "" # XO hack here ap_device would not be active therefore not set with # wired as gw use ap_device to exclude eth0 from network calulations From 3d0bdc47e448d72e716c3e425a2612213f3e9e9b Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Fri, 9 Oct 2020 07:30:18 -0500 Subject: [PATCH 2/2] record bare variables and use -e with the bare variables in the grep line --- roles/network/tasks/detected_network.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/roles/network/tasks/detected_network.yml b/roles/network/tasks/detected_network.yml index 5a9c9ee79..d87db5ca6 100644 --- a/roles/network/tasks/detected_network.yml +++ b/roles/network/tasks/detected_network.yml @@ -106,7 +106,7 @@ register: wifi_gateway_found when: discovered_wireless_iface != "none" -- name: Set has_wifi_gateway for {{ discovered_wireless_iface }} when WiFi gateway has been detected +- name: Set has_wifi_gateway if WiFi has default gateway detected for {{ discovered_wireless_iface }} set_fact: has_wifi_gateway: True when: discovered_wireless_iface != "none" and (wifi_gateway_found.stdout|int > 0) @@ -118,7 +118,7 @@ - name: Set exclude_devices if default gateway has been detected for {{ second_gateway_found.stdout }} set_fact: - exclude_devices: "-e {{ second_gateway_found.stdout }}" + exclude_devices: "{{ second_gateway_found.stdout }}" when: second_gateway_found.stdout != "" # XO hack here ap_device would not be active therefore not set with @@ -131,11 +131,11 @@ - name: Exclude reserved Network Adapter if defined - takes adapter name set_fact: - exclude_devices: "-e {{ reserved_device }} {{ exclude_devices }}" + exclude_devices: "{{ exclude_devices }} -e {{ reserved_device }}" when: reserved_device is defined - name: Count LAN ifaces - shell: ls /sys/class/net | grep -v {{ virtual_network_devices }} -e wwlan -e ppp -e {{ device_gw }} {{ exclude_devices }} | wc -l + shell: ls /sys/class/net | grep -v {{ virtual_network_devices }} -e wwlan -e ppp -e {{ device_gw }} -e {{ exclude_devices }} | wc -l register: num_lan_interfaces_result - name: Calculate number of LAN interfaces including WiFi @@ -144,7 +144,7 @@ # LAN - pick non WAN's - name: Create list of LAN (non WAN) ifaces - shell: ls /sys/class/net | grep -v {{ virtual_network_devices }} -e wwlan -e ppp -e {{ device_gw }} {{ exclude_devices }} + shell: ls /sys/class/net | grep -v {{ virtual_network_devices }} -e wwlan -e ppp -e {{ device_gw }} -e {{ exclude_devices }} when: num_lan_interfaces != "0" register: lan_list_result