distro/tests: fix DoH test

diff --git a/distro/tests/ansible-roles/knot_resolver/tasks/configure_doh.yaml b/distro/tests/ansible-roles/knot_resolver/tasks/configure_doh.yaml
index 987bbc1bfe4963c25cc4ade60e6ee4f018aaabfb..758fa7be3f8e479afca81f20be2a3879ae97c499 100644 (file)
--- a/distro/tests/ansible-roles/knot_resolver/tasks/configure_doh.yaml
+++ b/distro/tests/ansible-roles/knot_resolver/tasks/configure_doh.yaml
@@ -1,7 +1,9 @@
 ---
 - name: doh_config set up kresd.conf
   blockinfile:
-    marker: "-- {mark} ANSIBLE MANAGED BLOCK"
+    marker: -- {mark} ANSIBLE MANAGED BLOCK
     block: |
+      net.listen('127.0.0.1', 44353, { kind = 'doh' })
       modules.load('http')
     path: /etc/knot-resolver/kresd.conf
+    insertbefore: BOF

diff --git a/distro/tests/ansible-roles/knot_resolver/tasks/configure_doh_nosocket.yaml b/distro/tests/ansible-roles/knot_resolver/tasks/configure_doh_nosocket.yaml
deleted file mode 100644 (file)
index 758fa7b..0000000
--- a/distro/tests/ansible-roles/knot_resolver/tasks/configure_doh_nosocket.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- name: doh_config set up kresd.conf
-  blockinfile:
-    marker: -- {mark} ANSIBLE MANAGED BLOCK
-    block: |
-      net.listen('127.0.0.1', 44353, { kind = 'doh' })
-      modules.load('http')
-    path: /etc/knot-resolver/kresd.conf
-    insertbefore: BOF

diff --git a/distro/tests/ansible-roles/knot_resolver/tasks/main.yaml b/distro/tests/ansible-roles/knot_resolver/tasks/main.yaml
index e35fb1ec269509fb27591c80e9498bc9c37dc931..4f0004b43ed32d229bcb70f933928cdd8254a858 100644 (file)
--- a/distro/tests/ansible-roles/knot_resolver/tasks/main.yaml
+++ b/distro/tests/ansible-roles/knot_resolver/tasks/main.yaml
@@ -33,9 +33,7 @@
             state: latest
 
         - include: configure_doh.yaml
-          when: ansible_distribution in ["Fedora", "Debian", "Ubuntu"]
-        - include: configure_doh_nosocket.yaml
-          when: ansible_distribution == "CentOS"
+          when: ansible_distribution in ["CentOS", "Fedora", "Debian", "Ubuntu"]
 
         - include: restart_kresd.yaml
         - include: test_doh.yaml