From 5902805ac944ef6fe83508947de197678b8a86bd Mon Sep 17 00:00:00 2001
From: Quentin Dufour <quentin@deuxfleurs.fr>
Date: Thu, 22 Oct 2020 20:22:57 +0200
Subject: [PATCH] Reintroduce resolv.conf, it is needed + change DNS from FDN
 (broken) to Free

---
 os/config/production.yml                        | 9 ++++++---
 os/config/roles/consul/templates/consul.json.j2 | 3 ++-
 os/config/roles/network/tasks/main.yml          | 3 +++
 os/config/roles/network/templates/en.network    | 2 --
 os/config/roles/network/templates/resolv.conf   | 3 +++
 5 files changed, 14 insertions(+), 6 deletions(-)
 create mode 100644 os/config/roles/network/templates/resolv.conf

diff --git a/os/config/production.yml b/os/config/production.yml
index 77624c6..d31193e 100644
--- a/os/config/production.yml
+++ b/os/config/production.yml
@@ -7,7 +7,8 @@ cluster_nodes:
       ipv4: 192.168.1.2
       ipv6: 2a01:e35:2fdc:dbe0::2
       interface: eno1
-      dns_server: 80.67.169.40
+      dns_1: 212.27.40.240
+      dns_2: 212.27.40.241
       ansible_python_interpreter: python3
 
     silicareux:
@@ -17,7 +18,8 @@ cluster_nodes:
       ipv4: 192.168.1.3 
       ipv6: 2a01:e35:2fdc:dbe0::3
       interface: eno1 
-      dns_server: 80.67.169.40
+      dns_1: 212.27.40.240
+      dns_2: 212.27.40.241
       ansible_python_interpreter: python3
 
     wonse:
@@ -27,5 +29,6 @@ cluster_nodes:
       ipv4: 192.168.1.4
       ipv6: 2a01:e35:2fdc:dbe0::4
       interface: eno1
-      dns_server: 80.67.169.40
+      dns_1: 212.27.40.240
+      dns_2: 212.27.40.241
       ansible_python_interpreter: python3
diff --git a/os/config/roles/consul/templates/consul.json.j2 b/os/config/roles/consul/templates/consul.json.j2
index 76632a6..beea1fa 100644
--- a/os/config/roles/consul/templates/consul.json.j2
+++ b/os/config/roles/consul/templates/consul.json.j2
@@ -18,7 +18,8 @@
      "dns": 53
   },
   "recursors": [
-    "{{ dns_server }}"
+    "{{ dns_1 }}",
+    "{{ dns_2 }}"
   ],
   "encrypt": "{{ consul_gossip_encrypt }}",
   "domain": "2.cluster.deuxfleurs.fr",
diff --git a/os/config/roles/network/tasks/main.yml b/os/config/roles/network/tasks/main.yml
index caa6bff..8b6d92d 100644
--- a/os/config/roles/network/tasks/main.yml
+++ b/os/config/roles/network/tasks/main.yml
@@ -7,6 +7,9 @@
 - name: "Deploy systemd-networkd configuration"
   template: src=en.network dest=/etc/systemd/network/en.network
 
+- name: "Deploy resolv.conf (the DNS section in systemd-networkd requires systemd-resolved...)"
+  template: src=resolv.conf dest=/etc/resolv.conf
+
 - name: "Activate IP forwarding"
   sysctl:
     name: net.ipv4.ip_forward
diff --git a/os/config/roles/network/templates/en.network b/os/config/roles/network/templates/en.network
index b9b52e9..5e680da 100644
--- a/os/config/roles/network/templates/en.network
+++ b/os/config/roles/network/templates/en.network
@@ -5,5 +5,3 @@ Name={{ interface }}
 Address={{ ipv4 }}/24
 Address={{ ipv6 }}/64
 Gateway=192.168.1.254
-DNS={{ ipv4 }}
-DNS={{ dns_server }}
diff --git a/os/config/roles/network/templates/resolv.conf b/os/config/roles/network/templates/resolv.conf
new file mode 100644
index 0000000..44c1897
--- /dev/null
+++ b/os/config/roles/network/templates/resolv.conf
@@ -0,0 +1,3 @@
+nameserver {{ ipv4 }}
+nameserver {{ dns_1 }}
+nameserver {{ dns_2 }}