From 4f0466af48997dc8a4a88107a0edfbc446529ecd Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Thu, 16 Jan 2020 14:47:36 +0100 Subject: [PATCH] distro/tests: fix DoH test --- .../ansible-roles/knot_resolver/tasks/configure_doh.yaml | 4 +++- .../knot_resolver/tasks/configure_doh_nosocket.yaml | 9 --------- distro/tests/ansible-roles/knot_resolver/tasks/main.yaml | 4 +--- 3 files changed, 4 insertions(+), 13 deletions(-) delete mode 100644 distro/tests/ansible-roles/knot_resolver/tasks/configure_doh_nosocket.yaml 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 987bbc1bf..758fa7be3 100644 --- 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 index 758fa7be3..000000000 --- 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 e35fb1ec2..4f0004b43 100644 --- 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 -- 2.47.2