From e9b69a634fdb77d182d25c666f26bfccbc530b35 Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Thu, 8 Feb 2024 19:11:12 -0500
Subject: [PATCH] Dnsmasq should start at boot and just not care about docker
 specific interfaces.

---
 ansible/roles/dnsmasq/tasks/main.yml          | 20 ++++++++++++-------
 .../dnsmasq/templates/dnsmasq-10-consul.j2    |  2 +-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/ansible/roles/dnsmasq/tasks/main.yml b/ansible/roles/dnsmasq/tasks/main.yml
index 6ad99888b..9057498aa 100644
--- a/ansible/roles/dnsmasq/tasks/main.yml
+++ b/ansible/roles/dnsmasq/tasks/main.yml
@@ -80,14 +80,20 @@
     state: directory
     mode: 0755
 
-- name: Add override for dnsmasq service
-  become: yes
-  copy:
-    dest: /etc/systemd/system/dnsmasq.service.d/override.conf
-    content: |
-      [Unit]
-      After=docker.service
+# - name: Add override for dnsmasq service
+#   become: yes
+#   copy:
+#     dest: /etc/systemd/system/dnsmasq.service.d/override.conf
+#     content: |
+#       [Unit]
+#       After=docker.service
 
+- name: Remove override for dnsmasq service
+  become: yes
+  file:
+    path: /etc/systemd/system/dnsmasq.service.d/override.conf
+    state: absent
+    
 - name: Launch dnsmasq
   become: yes
   service:
diff --git a/ansible/roles/dnsmasq/templates/dnsmasq-10-consul.j2 b/ansible/roles/dnsmasq/templates/dnsmasq-10-consul.j2
index 367a3f209..284720095 100644
--- a/ansible/roles/dnsmasq/templates/dnsmasq-10-consul.j2
+++ b/ansible/roles/dnsmasq/templates/dnsmasq-10-consul.j2
@@ -9,7 +9,7 @@ server=/consul/127.0.0.1#8600
 no-resolv
 
 {% for interface in network_interfaces %}
-{% if not interface.startswith('veth') %}
+{% if not interface.startswith('veth') and not interface.startswith('docker') and not interface.startswith('br') %}
 interface={{ interface }}
 {% endif %}
 {% endfor %}