From 0851b6093d1d3a8827269695893e38bda3d1745a Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 20 Jun 2019 12:03:03 -0500 Subject: [PATCH 1/3] Update detected_network.yml Docker --- roles/network/tasks/detected_network.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/network/tasks/detected_network.yml b/roles/network/tasks/detected_network.yml index 457947b84..05a0d8ba0 100644 --- a/roles/network/tasks/detected_network.yml +++ b/roles/network/tasks/detected_network.yml @@ -112,7 +112,7 @@ # LAN - pick non WAN's - name: Create list of LAN (non WAN) ifaces - shell: ls /sys/class/net | grep -v -e wwlan -e ppp -e lo -e br0 -e tun -e {{ device_gw }} -e {{ ap_device }} + shell: ls /sys/class/net | grep -v -e wwlan -e ppp -e lo -e br0 -e tun -e bridge0 -e veth -e {{ device_gw }} -e {{ ap_device }} when: num_lan_interfaces != "0" register: lan_list_result From 718fccc51cc6ccdd557c74c4a7f5601d120dff0f Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 20 Jun 2019 12:11:45 -0500 Subject: [PATCH 2/3] Update computed_network.yml Docker --- roles/network/tasks/computed_network.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/network/tasks/computed_network.yml b/roles/network/tasks/computed_network.yml index 51b65497d..c66bb0a14 100644 --- a/roles/network/tasks/computed_network.yml +++ b/roles/network/tasks/computed_network.yml @@ -157,7 +157,7 @@ # so this works - name: Interface count - shell: ls /sys/class/net | grep -v -e lo | wc | awk '{print $1}' + shell: ls /sys/class/net | grep -v -e lo -e bridge0 -e veth | wc | awk '{print $1}' register: adapter_count # well if there ever was a point to tell the user things are FUBAR this is it. From 808d7d1697a28b23bc81c14a2d797f3a501841f5 Mon Sep 17 00:00:00 2001 From: Anish Mangal Date: Sun, 23 Jun 2019 02:39:27 +0000 Subject: [PATCH 3/3] Add br-* and docker to network interface list to exclude --- roles/network/tasks/computed_network.yml | 2 +- roles/network/tasks/detected_network.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/network/tasks/computed_network.yml b/roles/network/tasks/computed_network.yml index c66bb0a14..3b0e24879 100644 --- a/roles/network/tasks/computed_network.yml +++ b/roles/network/tasks/computed_network.yml @@ -157,7 +157,7 @@ # so this works - name: Interface count - shell: ls /sys/class/net | grep -v -e lo -e bridge0 -e veth | wc | awk '{print $1}' + shell: ls /sys/class/net | grep -v -e lo -e bridge0 -e veth -e "br-*" -e docker| wc | awk '{print $1}' register: adapter_count # well if there ever was a point to tell the user things are FUBAR this is it. diff --git a/roles/network/tasks/detected_network.yml b/roles/network/tasks/detected_network.yml index 05a0d8ba0..21b33d844 100644 --- a/roles/network/tasks/detected_network.yml +++ b/roles/network/tasks/detected_network.yml @@ -112,7 +112,7 @@ # LAN - pick non WAN's - name: Create list of LAN (non WAN) ifaces - shell: ls /sys/class/net | grep -v -e wwlan -e ppp -e lo -e br0 -e tun -e bridge0 -e veth -e {{ device_gw }} -e {{ ap_device }} + shell: ls /sys/class/net | grep -v -e wwlan -e ppp -e lo -e br0 -e tun -e "br-*" -e docker -e bridge0 -e veth -e {{ device_gw }} -e {{ ap_device }} when: num_lan_interfaces != "0" register: lan_list_result