From ec2f134ec95b2ba928e7f611d42616bbcb341f58 Mon Sep 17 00:00:00 2001
From: arttu <arttu.makiporhola@geniem.com>
Date: Tue, 11 Jun 2019 12:57:30 +0300
Subject: [PATCH 1/3] 18.04 support

---
 ansible/ubuntu/ubuntu_bionic_includes.yml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 ansible/ubuntu/ubuntu_bionic_includes.yml

diff --git a/ansible/ubuntu/ubuntu_bionic_includes.yml b/ansible/ubuntu/ubuntu_bionic_includes.yml
new file mode 100644
index 0000000..bba7462
--- /dev/null
+++ b/ansible/ubuntu/ubuntu_bionic_includes.yml
@@ -0,0 +1,21 @@
+    - name: Ensure /etc/systemd/resolved.conf.d dir exists
+      become: yes
+      become_method: sudo
+      file: path=/etc/systemd/resolved.conf.d state=directory
+
+    - name: Create dns resolver files at /etc/systemd/resolved.conf.d/
+      become: yes
+      become_method: sudo
+      template:
+        src: "{{ gdev_env_dir }}/ansible/ubuntu/ubuntu_resolvd.conf"
+        dest: "/etc/systemd/resolved.conf.d/{{item.domain}}.conf"
+        force: yes
+      with_items:
+        - { ip: "{{ machine_ip }}", domain: test }
+
+    - name: Restart systemd-resolved
+      become: yes
+      become_method: sudo      
+      service: 
+        name: systemd-resolved
+        state: restarted
\ No newline at end of file

From 0af2fad925231cd65f47111c44a8469ed78f3fa6 Mon Sep 17 00:00:00 2001
From: arttu <arttu.makiporhola@geniem.com>
Date: Tue, 11 Jun 2019 13:02:40 +0300
Subject: [PATCH 2/3] change the ansible so it fetches the actually needed one

---
 ansible/ubuntu/ubuntu_bionic_includes.yml | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/ansible/ubuntu/ubuntu_bionic_includes.yml b/ansible/ubuntu/ubuntu_bionic_includes.yml
index bba7462..0602784 100644
--- a/ansible/ubuntu/ubuntu_bionic_includes.yml
+++ b/ansible/ubuntu/ubuntu_bionic_includes.yml
@@ -1,21 +1,2 @@
-    - name: Ensure /etc/systemd/resolved.conf.d dir exists
-      become: yes
-      become_method: sudo
-      file: path=/etc/systemd/resolved.conf.d state=directory
-
-    - name: Create dns resolver files at /etc/systemd/resolved.conf.d/
-      become: yes
-      become_method: sudo
-      template:
-        src: "{{ gdev_env_dir }}/ansible/ubuntu/ubuntu_resolvd.conf"
-        dest: "/etc/systemd/resolved.conf.d/{{item.domain}}.conf"
-        force: yes
-      with_items:
-        - { ip: "{{ machine_ip }}", domain: test }
-
-    - name: Restart systemd-resolved
-      become: yes
-      become_method: sudo      
-      service: 
-        name: systemd-resolved
-        state: restarted
\ No newline at end of file
+    - name: Use tasks from zesty release
+      include: "ubuntu_bionic_includes.yml"

From 4ecc2c28199f276666e44d8bf99def5875b05ea3 Mon Sep 17 00:00:00 2001
From: arttu <arttu.makiporhola@geniem.com>
Date: Tue, 11 Jun 2019 13:08:10 +0300
Subject: [PATCH 3/3] typo

---
 ansible/ubuntu/ubuntu_bionic_includes.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/ubuntu/ubuntu_bionic_includes.yml b/ansible/ubuntu/ubuntu_bionic_includes.yml
index 0602784..c119f83 100644
--- a/ansible/ubuntu/ubuntu_bionic_includes.yml
+++ b/ansible/ubuntu/ubuntu_bionic_includes.yml
@@ -1,2 +1,2 @@
     - name: Use tasks from zesty release
-      include: "ubuntu_bionic_includes.yml"
+      include: "ubuntu_zesty_includes.yml"