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

refined

Browse source
This commit is contained in:
A Holt 2017-10-27 13:49:00 -04:00 • committed by GitHub
parent bc10993ec3
commit d38627f053
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -20,13 +20,13 @@
device_gw2: "{{ prior_gw.stdout }}" device_gw2: "{{ prior_gw.stdout }}"
when: not first_run and prior_gw is defined and prior_gw.stdout != "" when: not first_run and prior_gw is defined and prior_gw.stdout != ""
- name: Setting wan if detected - name: Setting WAN if detected
set_fact: set_fact:
iiab_wan_iface: "{{ discovered_wan_iface }}" iiab_wan_iface: "{{ discovered_wan_iface }}"
device_gw: "{{ discovered_wan_iface }}" device_gw: "{{ discovered_wan_iface }}"
when: discovered_wan_iface != "none" when: discovered_wan_iface != "none"
- name: RedHat Network detection - name: RedHat network detection
include: detected_redhat.yml include: detected_redhat.yml
when: is_redhat when: is_redhat
@ -46,14 +46,14 @@
- "{{ wireless_list1.stdout_lines }}" - "{{ wireless_list1.stdout_lines }}"
# WIRELESS -- Sigh... Not all drivers update /proc/net/wireless correctly # WIRELESS -- Sigh... Not all drivers update /proc/net/wireless correctly
- name: Look for any wireless interfaces take 2 - name: Look for any wireless interfaces (take 2)
shell: "ls -la /sys/class/net/*/phy80211 | awk -F / '{print $5}'" shell: "ls -la /sys/class/net/*/phy80211 | awk -F / '{print $5}'"
register: wireless_list2 register: wireless_list2
ignore_errors: True ignore_errors: True
changed_when: False changed_when: False
# Last device is used # Last device is used
- name: Set the discovered wireless, if found take 2 - name: Set the discovered wireless, if found (take 2)
set_fact: set_fact:
wifi2: "{{ item|trim }}" wifi2: "{{ item|trim }}"
discovered_wireless_iface: "{{ item|trim }}" discovered_wireless_iface: "{{ item|trim }}"
@ -118,7 +118,7 @@
# num_lan_interfaces: "1" # num_lan_interfaces: "1"
# when: iiab_lan_enabled and iiab_wan_enabled and num_lan_interfaces == "2" and discovered_wireless_iface != "none" and iiab_wan_iface == "none" # when: iiab_lan_enabled and iiab_wan_enabled and num_lan_interfaces == "2" and discovered_wireless_iface != "none" and iiab_wan_iface == "none"
- name: Set the variable for wireless_iface if present - name: Set variable discovered_wireless_iface if present
set_fact: set_fact:
iiab_wireless_lan_iface: "{{ discovered_wireless_iface }}" iiab_wireless_lan_iface: "{{ discovered_wireless_iface }}"
when: discovered_wireless_iface != "none" and discovered_wireless_iface != iiab_wan_iface when: discovered_wireless_iface != "none" and discovered_wireless_iface != iiab_wan_iface