Merge pull request #1765 from m-anish/dnsmasq-fix

Dnsmasq fixes

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 -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.

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 "br-*" -e docker -e bridge0 -e veth -e {{ device_gw }} -e {{ ap_device }}
   when: num_lan_interfaces != "0"
   register: lan_list_result
 

roles/network/tasks/enable_services.yml

@@ -54,6 +54,15 @@
     dest: /etc/dnsmasq.d/iiab.conf
   when: dnsmasq_enabled and dnsmasq_install and (iiab_network_mode != "Appliance")
 
+- name: Copy script to restart dnsmasq whenever br0 comes up
+  template: 
+    src: "roles/network/templates/network/dnsmasq.sh.j2"
+    dest: "/etc/networkd-dispatcher/routable.d/dnsmasq.sh"
+    mode: "0755"
+    owner: root
+    group: root
+  when: dnsmasq_enabled and dnsmasq_install and (iiab_network_mode != "Appliance")
+
 - name: Remove /etc/dnsmasq.d/iiab.conf, when not dnsmasq_enabled or is Appliance
   file:
     path: /etc/dnsmasq.d/iiab.conf

roles/network/templates/network/dnsmasq.sh.j2

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+if [ "$IFACE" == "{{ iiab_lan_iface }}" ];
+then
+	/bin/systemctl restart dnsmasq.service
+fi