From aed16ca9f2b000ba8c07bd83ef72760b3561f5bb Mon Sep 17 00:00:00 2001
From: Jerry Vonau <jvonau3@gmail.com>
Date: Tue, 15 Sep 2020 07:34:50 -0500
Subject: [PATCH] exclude_device -> exclude_devices

There can be more than one
---
 roles/network/defaults/main.yml          |  2 +-
 roles/network/tasks/detected_network.yml | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/roles/network/defaults/main.yml b/roles/network/defaults/main.yml
index 5ff95f432..03204958e 100644
--- a/roles/network/defaults/main.yml
+++ b/roles/network/defaults/main.yml
@@ -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
 wifi1: "not found-1"
 wifi2: "not found-2"
-exclude_device: "none"
+exclude_devices: "none"
 device_gw: "none"
 prior_gw_device: ""
 
diff --git a/roles/network/tasks/detected_network.yml b/roles/network/tasks/detected_network.yml
index 700eb4148..e564687b6 100644
--- a/roles/network/tasks/detected_network.yml
+++ b/roles/network/tasks/detected_network.yml
@@ -108,7 +108,7 @@
 
 - name: Set has_wifi_gateway for {{ discovered_wireless_iface }} if gateway is detected
   set_fact:
-    exclude_device: "-e {{ discovered_wireless_iface }}"
+    exclude_devices: "-e {{ discovered_wireless_iface }}"
     has_wifi_gateway: True
   when: discovered_wireless_iface != "none" and (wifi_gateway_found.stdout|int > 0)
 
@@ -117,16 +117,16 @@
 
 #- name: XO laptop override 2 WiFi on LAN
 #  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"
 
 - name: Exclude reserved Network Adapter if defined - takes adapter name
   set_fact:
-    exclude_device: "-e {{ reserved_device }} {{ exclude_device }}"
+    exclude_devices: "-e {{ reserved_device }} {{ exclude_devices }}"
   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_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
 
 - name: Calculate number of LAN interfaces including WiFi
@@ -135,7 +135,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_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"
   register: lan_list_result
 
@@ -241,8 +241,8 @@
     value: "{{ discovered_wireless_iface }}"
   - option: discovered_wired_iface
     value: "{{ discovered_wired_iface }}"
-#  - option: 'iiab_wireless_lan_iface
-#    value: '{{ iiab_wireless_lan_iface }}"
+  - option: 'exclude_devices'
+    value: "{{ exclude_devices }}"
   - option: num_lan_interfaces
     value: "{{ num_lan_interfaces }}"
   - option: gui_static_wan