mirror of
https://github.com/iiab/iiab.git
synced 2025-03-09 15:40:17 +00:00
Merge pull request #2562 from jvonau/u20-wired-slave
For TK alter use of second_gateway_found.changed
This commit is contained in:
commit
808d8d362c
1 changed files with 9 additions and 8 deletions
|
@ -106,19 +106,20 @@
|
||||||
register: wifi_gateway_found
|
register: wifi_gateway_found
|
||||||
when: discovered_wireless_iface != "none"
|
when: discovered_wireless_iface != "none"
|
||||||
|
|
||||||
- name: Set has_wifi_gateway for {{ discovered_wireless_iface }} if WiFi gateway is detected
|
- name: Set has_wifi_gateway if WiFi has default gateway detected for {{ discovered_wireless_iface }}
|
||||||
set_fact:
|
set_fact:
|
||||||
has_wifi_gateway: True
|
has_wifi_gateway: True
|
||||||
when: discovered_wireless_iface != "none" and (wifi_gateway_found.stdout|int > 0)
|
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}'
|
shell: ip r | grep default | grep -v {{ discovered_wan_iface }} | awk '{print $5}'
|
||||||
register: second_gateway_found
|
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:
|
set_fact:
|
||||||
exclude_devices: "-e {{ second_gateway_found.stdout }}"
|
exclude_devices: "{{ 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
|
# 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
|
# wired as gw use ap_device to exclude eth0 from network calulations
|
||||||
|
@ -130,11 +131,11 @@
|
||||||
|
|
||||||
- name: Exclude reserved Network Adapter if defined - takes adapter name
|
- name: Exclude reserved Network Adapter if defined - takes adapter name
|
||||||
set_fact:
|
set_fact:
|
||||||
exclude_devices: "-e {{ reserved_device }} {{ exclude_devices }}"
|
exclude_devices: "{{ exclude_devices }} -e {{ reserved_device }}"
|
||||||
when: reserved_device is defined
|
when: reserved_device is defined
|
||||||
|
|
||||||
- name: Count LAN ifaces
|
- 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
|
register: num_lan_interfaces_result
|
||||||
|
|
||||||
- name: Calculate number of LAN interfaces including WiFi
|
- name: Calculate number of LAN interfaces including WiFi
|
||||||
|
@ -143,7 +144,7 @@
|
||||||
|
|
||||||
# LAN - pick non WAN's
|
# LAN - pick non WAN's
|
||||||
- name: Create list of LAN (non WAN) ifaces
|
- 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"
|
when: num_lan_interfaces != "0"
|
||||||
register: lan_list_result
|
register: lan_list_result
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue