From d6139f2e66c1539f14cfadc250f7476e82db9d75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20V=C3=A1vra?= <jvavra@redhat.com>
Date: Fri, 31 May 2024 14:37:35 +0200
Subject: [PATCH] dns: Tweak dns role to work better with systemd-resolved

---
 src/ansible/roles/dns/tasks/main.yml | 42 ++++++++++++++++++++++++----
 1 file changed, 37 insertions(+), 5 deletions(-)

diff --git a/src/ansible/roles/dns/tasks/main.yml b/src/ansible/roles/dns/tasks/main.yml
index 56889a57..9084ac37 100644
--- a/src/ansible/roles/dns/tasks/main.yml
+++ b/src/ansible/roles/dns/tasks/main.yml
@@ -1,6 +1,14 @@
 - name: Gather facts
   ansible.builtin.setup:
 
+- name: Add fqdn and short hostname to /etc/hosts
+  ansible.builtin.lineinfile:
+    line: "{{ hostvars[inventory_hostname]['ansible_default_ipv4']['address'] }} \
+      {{ inventory_hostname }} {{ inventory_hostname.split('.')[0] }}"
+    path: /etc/hosts
+  when: ansible_os_family != "Windows"
+  become: true
+
 - name: Setup dns (on dns machine)
   block:
   - name: Install dnsmasq package
@@ -25,17 +33,41 @@
   - name: Gather the package facts
     ansible.builtin.package_facts:
 
-  - name: Disable systemd-resolved (if present)
-    ansible.builtin.service:
+  - name: Create dnsmasq.service.d if needed
+    ansible.builtin.file:
+      path: /etc/systemd/system/dnsmasq.service.d/
+      state: directory
+      recurse: yes
+      owner: root
+      group: root
+
+  - name: Force dnsmasq before systemd-resolved
+    copy:
+      content: |
+        [Unit]
+        After=systemd-resolved.service
+        [Service]
+        ExecStartPre=/usr/bin/systemctl stop systemd-resolved.service
+        ExecStartPost=/usr/bin/systemctl start systemd-resolved.service
+      dest: /etc/systemd/system/dnsmasq.service.d/resolved-fix.conf
+      owner: root
+      group: root
+      mode: '0644'
+    when: "'systemd-resolved' in ansible_facts.packages"
+
+  - name: Restart systemd-resolved (if present)
+    ansible.builtin.systemd_service:
       name: systemd-resolved
-      enabled: false
-      state: stopped
+      daemon_reload: true
+      state: restarted
     when: "'systemd-resolved' in ansible_facts.packages"
 
   - name: Restart dnsmasq service
-    ansible.builtin.service:
+    ansible.builtin.systemd_service:
       name: dnsmasq
       enabled: true
+      daemon_reload: true
       state: restarted
+
   when: "'dns' in group_names"
   become: true