From 0d07850f24915d932940556a598a2aceeccb47f6 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 24 Feb 2026 16:06:55 +0100 Subject: [PATCH 1/7] Additional fixes related to 8c393cd changes Signed-off-by: suman-jainkeri Signed-off-by: root --- roles/check_dns/tasks/main.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/check_dns/tasks/main.yaml b/roles/check_dns/tasks/main.yaml index 404242727..4ea98a052 100644 --- a/roles/check_dns/tasks/main.yaml +++ b/roles/check_dns/tasks/main.yaml @@ -2,14 +2,14 @@ - name: Check internal cluster DNS resolution for the bastion tags: check_dns, dns - shell: "dig +short {{ env.bastion.networking.hostname }}.{{ env.bastion.networking.base_domain }} | tail -n1" + shell: "dig +short {{ env.bastion.networking.hostname }}.{{ env.cluster.networking.metadata_name }}.{{ env.bastion.networking.base_domain }} | tail -n1" register: bastion_lookup failed_when: env.bastion.networking.ip != bastion_lookup.stdout when: env.bastion.networking.internal_ip is not defined or env.bastion.networking.internal_ip == None - name: Check internal cluster DNS resolution for the bastion with Internal_IP tags: check_dns, dns - shell: "dig +short {{ env.bastion.networking.hostname }}.{{ env.bastion.networking.base_domain }} | tail -n1" + shell: "dig +short {{ env.bastion.networking.hostname }}.{{ env.cluster.networking.metadata_name }}.{{ env.bastion.networking.base_domain }} | tail -n1" register: bastion_lookup failed_when: env.bastion.networking.internal_ip != bastion_lookup.stdout when: env.bastion.networking.internal_ip is defined and env.bastion.networking.internal_ip != None From 87d38b502b1cb5603fa312bdfbb9f5fedc88ea35 Mon Sep 17 00:00:00 2001 From: Suman Jainkeri Date: Wed, 25 Feb 2026 17:16:56 +0530 Subject: [PATCH 2/7] Update dns-named.conf.j2 Signed-off-by: root --- roles/dns/templates/dns-named.conf.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/dns/templates/dns-named.conf.j2 b/roles/dns/templates/dns-named.conf.j2 index b7708861c..accc4d378 100644 --- a/roles/dns/templates/dns-named.conf.j2 +++ b/roles/dns/templates/dns-named.conf.j2 @@ -73,7 +73,7 @@ zone "{{ env.cluster.networking.metadata_name }}.{{ env.cluster.networking.base_ // forwared zone zone "{{ env.cluster.networking.base_domain }}" IN { type forward; - forwarders { {{ env.bastion.networking.nameserver2}} }; + forwarders { {{ env.bastion.networking.nameserver2; }} }; }; {% endif %} From f160e157e6a4cfc1e1c64f73253f62b292911977 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 25 Feb 2026 13:15:40 +0100 Subject: [PATCH 3/7] Fix lint errors: use FQCN and pipefail Signed-off-by: root --- roles/check_dns/tasks/main.yaml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/roles/check_dns/tasks/main.yaml b/roles/check_dns/tasks/main.yaml index 4ea98a052..354f57257 100644 --- a/roles/check_dns/tasks/main.yaml +++ b/roles/check_dns/tasks/main.yaml @@ -2,20 +2,20 @@ - name: Check internal cluster DNS resolution for the bastion tags: check_dns, dns - shell: "dig +short {{ env.bastion.networking.hostname }}.{{ env.cluster.networking.metadata_name }}.{{ env.bastion.networking.base_domain }} | tail -n1" + ansible.builtin.shell: "set -o pipefail; dig +short {{ env.bastion.networking.hostname }}.{{ env.cluster.networking.metadata_name }}.{{ env.bastion.networking.base_domain }} | tail -n1" register: bastion_lookup failed_when: env.bastion.networking.ip != bastion_lookup.stdout when: env.bastion.networking.internal_ip is not defined or env.bastion.networking.internal_ip == None - name: Check internal cluster DNS resolution for the bastion with Internal_IP tags: check_dns, dns - shell: "dig +short {{ env.bastion.networking.hostname }}.{{ env.cluster.networking.metadata_name }}.{{ env.bastion.networking.base_domain }} | tail -n1" + ansible.builtin.shell: "set -o pipefail; dig +short {{ env.bastion.networking.hostname }}.{{ env.cluster.networking.metadata_name }}.{{ env.bastion.networking.base_domain }} | tail -n1" register: bastion_lookup failed_when: env.bastion.networking.internal_ip != bastion_lookup.stdout when: env.bastion.networking.internal_ip is defined and env.bastion.networking.internal_ip != None - name: Set expected IP for DNS check - set_fact: + ansible.builtin.set_fact: expected_ip: >- {{ env.bastion.networking.internal_ip @@ -29,7 +29,7 @@ - name: Check internal cluster DNS resolution for external API and apps services tags: check_dns, dns - shell: "dig +short {{ item }} | tail -n1" + ansible.builtin.shell: "set -o pipefail; dig +short {{ item }} | tail -n1" loop: - "api.{{ env.cluster.networking.metadata_name }}.{{ env.cluster.networking.base_domain }}" - "apps.{{ env.cluster.networking.metadata_name }}.{{ env.cluster.networking.base_domain }}" @@ -38,17 +38,17 @@ changed_when: false - name: Fail if any external DNS record resolves to wrong IP - fail: + ansible.builtin.fail: msg: > DNS mismatch: {{ item.item }} resolved to {{ item.stdout }}, expected {{ expected_ip }} loop: "{{ services_lookup.results }}" when: item.stdout != expected_ip - tags: check_dns, dns + tags: check_dns, dns - name: Check internal cluster DNS resolution for internal API services tags: check_dns, dns - shell: "dig +short api-int.{{ env.cluster.networking.metadata_name }}.{{ env.cluster.networking.base_domain }} | tail -n1" + ansible.builtin.shell: "set -o pipefail; dig +short api-int.{{ env.cluster.networking.metadata_name }}.{{ env.cluster.networking.base_domain }} | tail -n1" register: api_int_lookup changed_when: false @@ -59,11 +59,11 @@ resolved to {{ api_int_lookup.stdout }}, expected {{ expected_ip }} when: api_int_lookup.stdout != expected_ip - tags: check_dns, dns - + tags: check_dns, dns + - name: Check internal cluster DNS resolution for bootstrap tags: check_dns, dns - shell: "dig +short {{ env.cluster.nodes.bootstrap.hostname }}.{{ env.cluster.networking.metadata_name }}.{{ env.cluster.networking.base_domain }} | tail -n1" + ansible.builtin.shell: "set -o pipefail; dig +short {{ env.cluster.nodes.bootstrap.hostname }}.{{ env.cluster.networking.metadata_name }}.{{ env.cluster.networking.base_domain }} | tail -n1" register: bootstrap_lookup failed_when: env.cluster.nodes.bootstrap.ip != bootstrap_lookup.stdout when: env.cluster.nodes.bootstrap is defined @@ -76,7 +76,7 @@ - name: Check control nodes DNS resolution tags: check_dns, dns - shell: "dig +short {{ env.cluster.nodes.control.hostname[i] }}.{{ env.cluster.networking.metadata_name }}.{{ env.cluster.networking.base_domain }} | tail -n1" + ansible.builtin.shell: "set -o pipefail; dig +short {{ env.cluster.nodes.control.hostname[i] }}.{{ env.cluster.networking.metadata_name }}.{{ env.cluster.networking.base_domain }} | tail -n1" register: control_lookup failed_when: env.cluster.nodes.control.ip[i] != control_lookup.stdout with_sequence: start=0 end={{(env.cluster.nodes.control.hostname | length) - 1}} stride=1 @@ -86,7 +86,7 @@ - name: Check compute nodes DNS resolution tags: check_dns, dns - shell: "dig +short {{ env.cluster.nodes.compute.hostname[i] }}.{{ env.cluster.networking.metadata_name }}.{{ env.cluster.networking.base_domain }} | tail -n1" + ansible.builtin.shell: "set -o pipefail; dig +short {{ env.cluster.nodes.compute.hostname[i] }}.{{ env.cluster.networking.metadata_name }}.{{ env.cluster.networking.base_domain }} | tail -n1" register: compute_lookup failed_when: env.cluster.nodes.compute.ip[i] != compute_lookup.stdout with_sequence: start=0 end={{(env.cluster.nodes.compute.hostname | length) - 1}} stride=1 @@ -97,7 +97,7 @@ - name: Check infrastructure nodes DNS resolution tags: check_dns, dns - shell: "dig +short {{ env.cluster.nodes.infra.hostname[i] }}.{{ env.cluster.networking.metadata_name }}.{{ env.cluster.networking.base_domain }} | tail -n1" + ansible.builtin.shell: "set -o pipefail; dig +short {{ env.cluster.nodes.infra.hostname[i] }}.{{ env.cluster.networking.metadata_name }}.{{ env.cluster.networking.base_domain }} | tail -n1" register: infra_lookup failed_when: env.cluster.nodes.infra.ip[i] != infra_lookup.stdout with_sequence: start=0 end={{(env.cluster.nodes.infra.hostname | length) - 1}} stride=1 From 5b61b6e44662566ec91d3c38bb78233361958903 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 25 Feb 2026 13:28:53 +0100 Subject: [PATCH 4/7] Fix lint errors: Line length and truthly values Signed-off-by: root --- roles/check_dns/tasks/main.yaml | 34 ++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/roles/check_dns/tasks/main.yaml b/roles/check_dns/tasks/main.yaml index 354f57257..da4863572 100644 --- a/roles/check_dns/tasks/main.yaml +++ b/roles/check_dns/tasks/main.yaml @@ -2,14 +2,18 @@ - name: Check internal cluster DNS resolution for the bastion tags: check_dns, dns - ansible.builtin.shell: "set -o pipefail; dig +short {{ env.bastion.networking.hostname }}.{{ env.cluster.networking.metadata_name }}.{{ env.bastion.networking.base_domain }} | tail -n1" + ansible.builtin.shell: > + set -o pipefail; + dig +short {{ env.bastion.networking.hostname }}.{{ env.cluster.networking.metadata_name }}.{{ env.bastion.networking.base_domain }} | tail -n1 register: bastion_lookup failed_when: env.bastion.networking.ip != bastion_lookup.stdout when: env.bastion.networking.internal_ip is not defined or env.bastion.networking.internal_ip == None - name: Check internal cluster DNS resolution for the bastion with Internal_IP tags: check_dns, dns - ansible.builtin.shell: "set -o pipefail; dig +short {{ env.bastion.networking.hostname }}.{{ env.cluster.networking.metadata_name }}.{{ env.bastion.networking.base_domain }} | tail -n1" + ansible.builtin.shell: > + set -o pipefail; + dig +short {{ env.bastion.networking.hostname }}.{{ env.cluster.networking.metadata_name }}.{{ env.bastion.networking.base_domain }} | tail -n1 register: bastion_lookup failed_when: env.bastion.networking.internal_ip != bastion_lookup.stdout when: env.bastion.networking.internal_ip is defined and env.bastion.networking.internal_ip != None @@ -53,7 +57,7 @@ changed_when: false - name: Fail if internal DNS record resolves to wrong IP - fail: + ansible.builtin.fail: msg: > DNS mismatch: api-int.{{ env.cluster.networking.metadata_name }}.{{ env.cluster.networking.base_domain }} resolved to {{ api_int_lookup.stdout }}, @@ -63,46 +67,54 @@ - name: Check internal cluster DNS resolution for bootstrap tags: check_dns, dns - ansible.builtin.shell: "set -o pipefail; dig +short {{ env.cluster.nodes.bootstrap.hostname }}.{{ env.cluster.networking.metadata_name }}.{{ env.cluster.networking.base_domain }} | tail -n1" + ansible.builtin.shell: > + set -o pipefail; + dig +short {{ env.cluster.nodes.bootstrap.hostname }}.{{ env.cluster.networking.metadata_name }}.{{ env.cluster.networking.base_domain }} | tail -n1 register: bootstrap_lookup failed_when: env.cluster.nodes.bootstrap.ip != bootstrap_lookup.stdout when: env.cluster.nodes.bootstrap is defined - name: Print results from bootstrap lookup tags: check_dns, dns - debug: + ansible.builtin.debug: var: bootstrap_lookup.stdout when: env.cluster.nodes.bootstrap is defined - name: Check control nodes DNS resolution tags: check_dns, dns - ansible.builtin.shell: "set -o pipefail; dig +short {{ env.cluster.nodes.control.hostname[i] }}.{{ env.cluster.networking.metadata_name }}.{{ env.cluster.networking.base_domain }} | tail -n1" + ansible.builtin.shell: > + set -o pipefail; + dig +short {{ env.cluster.nodes.control.hostname[i] }}.{{ env.cluster.networking.metadata_name }}.{{ env.cluster.networking.base_domain }} | tail -n1 register: control_lookup failed_when: env.cluster.nodes.control.ip[i] != control_lookup.stdout with_sequence: start=0 end={{(env.cluster.nodes.control.hostname | length) - 1}} stride=1 loop_control: - extended: yes + extended: true index_var: i - name: Check compute nodes DNS resolution tags: check_dns, dns - ansible.builtin.shell: "set -o pipefail; dig +short {{ env.cluster.nodes.compute.hostname[i] }}.{{ env.cluster.networking.metadata_name }}.{{ env.cluster.networking.base_domain }} | tail -n1" + ansible.builtin.shell: > + set -o pipefail; + dig +short {{ env.cluster.nodes.compute.hostname[i] }}.{{ env.cluster.networking.metadata_name }}.{{ env.cluster.networking.base_domain }} | tail -n1 register: compute_lookup failed_when: env.cluster.nodes.compute.ip[i] != compute_lookup.stdout with_sequence: start=0 end={{(env.cluster.nodes.compute.hostname | length) - 1}} stride=1 loop_control: - extended: yes + extended: true index_var: i when: env.cluster.nodes.compute.hostname is defined and env.cluster.nodes.compute.hostname[0] is defined and env.cluster.nodes.compute.hostname[0] != None - name: Check infrastructure nodes DNS resolution tags: check_dns, dns - ansible.builtin.shell: "set -o pipefail; dig +short {{ env.cluster.nodes.infra.hostname[i] }}.{{ env.cluster.networking.metadata_name }}.{{ env.cluster.networking.base_domain }} | tail -n1" + ansible.builtin.shell: > + set -o pipefail; + dig +short {{ env.cluster.nodes.infra.hostname[i] }}.{{ env.cluster.networking.metadata_name }}.{{ env.cluster.networking.base_domain }} | tail -n1 register: infra_lookup failed_when: env.cluster.nodes.infra.ip[i] != infra_lookup.stdout with_sequence: start=0 end={{(env.cluster.nodes.infra.hostname | length) - 1}} stride=1 loop_control: - extended: yes + extended: true index_var: i when: env.cluster.nodes.infra.hostname is defined From 58dc9c46e6c41067a2bbd5966cd0aa860c618669 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 25 Feb 2026 13:31:35 +0100 Subject: [PATCH 5/7] Fix lint errors: Use FQCN Signed-off-by: root --- roles/check_dns/tasks/main.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/check_dns/tasks/main.yaml b/roles/check_dns/tasks/main.yaml index da4863572..1f53970f2 100644 --- a/roles/check_dns/tasks/main.yaml +++ b/roles/check_dns/tasks/main.yaml @@ -122,7 +122,7 @@ tags: check_dns, dns register: external_dns_check failed_when: '"server can" in external_dns_check.stdout' - command: "nslookup {{ item }}" + ansible.builtin.command: "nslookup {{ item }}" loop: - www.google.com - www.ibm.com From e83774164aacfc50b1adebad34062f35f857c944 Mon Sep 17 00:00:00 2001 From: Suman Jainkeri Date: Wed, 25 Feb 2026 18:50:35 +0530 Subject: [PATCH 6/7] Update dns-named.conf.j2 Signed-off-by: root --- roles/dns/templates/dns-named.conf.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/dns/templates/dns-named.conf.j2 b/roles/dns/templates/dns-named.conf.j2 index accc4d378..495d1c59b 100644 --- a/roles/dns/templates/dns-named.conf.j2 +++ b/roles/dns/templates/dns-named.conf.j2 @@ -73,7 +73,7 @@ zone "{{ env.cluster.networking.metadata_name }}.{{ env.cluster.networking.base_ // forwared zone zone "{{ env.cluster.networking.base_domain }}" IN { type forward; - forwarders { {{ env.bastion.networking.nameserver2; }} }; + forwarders { {{ env.bastion.networking.nameserver2 }}; }; }; {% endif %} From e102963eccc6321da29860b21135db8852670199 Mon Sep 17 00:00:00 2001 From: Suman Jainkeri Date: Wed, 25 Feb 2026 18:51:35 +0530 Subject: [PATCH 7/7] Update dns-named.conf.j2 Signed-off-by: root --- roles/dns/templates/dns-named.conf.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/dns/templates/dns-named.conf.j2 b/roles/dns/templates/dns-named.conf.j2 index 495d1c59b..ce60f75c2 100644 --- a/roles/dns/templates/dns-named.conf.j2 +++ b/roles/dns/templates/dns-named.conf.j2 @@ -73,7 +73,7 @@ zone "{{ env.cluster.networking.metadata_name }}.{{ env.cluster.networking.base_ // forwared zone zone "{{ env.cluster.networking.base_domain }}" IN { type forward; - forwarders { {{ env.bastion.networking.nameserver2 }}; }; + forwarders { {{ env.bastion.networking.nameserver2}}; }; }; {% endif %}