external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-02-13 11:42:08 +00:00
Code Issues Releases Wiki Activity

exclude_device -> exclude_devices

Browse source 
There can be more than one
This commit is contained in:
Jerry Vonau 2020-09-15 07:34:50 -05:00
parent 0d1451f2cc
commit aed16ca9f2
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/network/defaults/main.yml
View file

@ -59,7 +59,7 @@ virtual_network_devices: "-e ap0 -e lo -e br0 -e tun -e br- -e docker -e bridge0
# Set defaults for discovery process as strings # Set defaults for discovery process as strings
wifi1: "not found-1" wifi1: "not found-1"
wifi2: "not found-2" wifi2: "not found-2"
exclude_device: "none" exclude_devices: "none"
device_gw: "none" device_gw: "none"
prior_gw_device: "" prior_gw_device: ""

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

@ -108,7 +108,7 @@
- name: Set has_wifi_gateway for {{ discovered_wireless_iface }} if gateway is detected - name: Set has_wifi_gateway for {{ discovered_wireless_iface }} if gateway is detected
set_fact: set_fact:
exclude_device: "-e {{ discovered_wireless_iface }}" exclude_devices: "-e {{ discovered_wireless_iface }}"
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)
@ -117,16 +117,16 @@
#- name: XO laptop override 2 WiFi on LAN #- name: XO laptop override 2 WiFi on LAN
# set_fact: # set_fact:
# exclude_device: "eth0" # exclude_devices: "-e eth0"
# when: iiab_wan_iface != "eth0" and discovered_wireless_iface != "none" and xo_model == "XO-1.5" # when: iiab_wan_iface != "eth0" and discovered_wireless_iface != "none" and xo_model == "XO-1.5"
- 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_device: "-e {{ reserved_device }} {{ exclude_device }}" exclude_devices: "-e {{ reserved_device }} {{ exclude_devices }}"
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_device }} | wc -l shell: ls /sys/class/net | grep -v {{ virtual_network_devices }} -e wwlan -e ppp -e {{ device_gw }} {{ 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
@ -135,7 +135,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_device }} shell: ls /sys/class/net | grep -v {{ virtual_network_devices }} -e wwlan -e ppp -e {{ device_gw }} {{ exclude_devices }}
when: num_lan_interfaces != "0" when: num_lan_interfaces != "0"
register: lan_list_result register: lan_list_result
@ -241,8 +241,8 @@
value: "{{ discovered_wireless_iface }}" value: "{{ discovered_wireless_iface }}"
- option: discovered_wired_iface - option: discovered_wired_iface
value: "{{ discovered_wired_iface }}" value: "{{ discovered_wired_iface }}"
# - option: 'iiab_wireless_lan_iface - option: 'exclude_devices'
# value: '{{ iiab_wireless_lan_iface }}" value: "{{ exclude_devices }}"
- option: num_lan_interfaces - option: num_lan_interfaces
value: "{{ num_lan_interfaces }}" value: "{{ num_lan_interfaces }}"
- option: gui_static_wan - option: gui_static_wan