external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2515 from jvonau/wifi_default

Browse source 
detect secondary gateway on wifi interface for no_net_restart
This commit is contained in:
A Holt 2020-09-12 20:42:31 -04:00 • committed by GitHub
commit a4afb3b08e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
roles/network/tasks/detected_network.yml
View file

@ -145,6 +145,15 @@
with_items: with_items:
- "{{ lan_list_result.stdout_lines }}" - "{{ 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 - name: Set iiab_wireless_lan_iface to {{ discovered_wireless_iface }} if not none
set_fact: set_fact:

13
roles/network/tasks/main.yml
View file

@ -6,13 +6,14 @@
- name: detected_network - name: detected_network
include_tasks: detected_network.yml include_tasks: detected_network.yml
- name: "Set 'no_net_restart: True' if discovered_wireless_iface == iiab_wan_iface" #- name: "Set 'no_net_restart: True' if discovered_wireless_iface == iiab_wan_iface"
- name: "Set 'no_net_restart: True' if has_wifi_gateway is defined"
set_fact: set_fact:
no_net_restart: True # 2020-05-09: Var is currently used in 10 files: no_net_restart: True # 2020-09-12: Var is currently used in 11 files...
# 0-init/defaults/main.yml, network/tasks/main.yml, debian.yml, # 0-init/defaults/main.yml, network/tasks/main.yml, computed_services.yml,
# detected_network.yml, down-debian.yml, NM-debian.yml, restart.yml, # debian.yml, detected_network.yml, down-debian.yml, netplan.yml,
# sysd-netd-debian.yml, computed_services.yml, rpi_debian.yml # NM-debian.yml, restart.yml, rpi_debian.yml, sysd-netd-debian.yml
when: discovered_wireless_iface == iiab_wan_iface when: has_wifi_gateway is defined
- name: computed_network - name: computed_network
include_tasks: computed_network.yml include_tasks: computed_network.yml