From 37259696868fadbfacb1af0479b0c108ae2da265 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Wed, 15 Apr 2020 06:31:05 -0500 Subject: [PATCH] remove dnsmasq workaround for br0 being down at boot --- roles/network/tasks/enable_services.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/roles/network/tasks/enable_services.yml b/roles/network/tasks/enable_services.yml index b0df14178..60d28a9f4 100644 --- a/roles/network/tasks/enable_services.yml +++ b/roles/network/tasks/enable_services.yml @@ -79,23 +79,23 @@ #- debug: # var: nd_enabled -- name: Check if /etc/networkd-dispatcher/routable.d exists - stat: - path: /etc/networkd-dispatcher/routable.d - register: nd_dir +#- name: Check if /etc/networkd-dispatcher/routable.d exists +# stat: +# path: /etc/networkd-dispatcher/routable.d +# register: nd_dir #- debug: # var: nd_dir #- name: To restart dnsmasq whenever br0 comes up, install /etc/networkd-dispatcher/routable.d/dnsmasq.sh from template (if isn't Appliance, and networkd-dispatcher is enabled, and directory /etc/networkd-dispatcher/routable.d exists, i.e. OS's like Ubuntu 18.04) -- name: To restart dnsmasq whenever br0 comes up, install /etc/networkd-dispatcher/routable.d/dnsmasq.sh from template (if isn't Appliance, and directory /etc/networkd-dispatcher/routable.d exists, i.e. OS's like Ubuntu 18.04) - 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_install and dnsmasq_enabled and nd_dir.stat.exists and nd_dir.stat.isdir and (iiab_network_mode != "Appliance") +#- name: To restart dnsmasq whenever br0 comes up, install /etc/networkd-dispatcher/routable.d/dnsmasq.sh from template (if isn't Appliance, and directory /etc/networkd-dispatcher/routable.d exists, i.e. OS's like Ubuntu 18.04) +# 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_install and dnsmasq_enabled and nd_dir.stat.exists and nd_dir.stat.isdir and (iiab_network_mode != "Appliance") #when: dnsmasq_install and dnsmasq_enabled and nd_enabled is defined and nd_enabled.stdout == "enabled" and nd_dir.stat.exists and nd_dir.stat.isdir and (iiab_network_mode != "Appliance") #when: dnsmasq_install and dnsmasq_enabled and systemd_out.status.UnitFileState == "enabled" and networkd_dir.stat.exists and networkd_dir.stat.isdir and (iiab_network_mode != "Appliance")