From a59c9085e7793885537e4a1fd616ca40480cec90 Mon Sep 17 00:00:00 2001
From: Klaus Smolin <smolin@de.ibm.com>
Date: Wed, 5 Jun 2024 07:04:37 +0200
Subject: [PATCH] fix: Wrong DNS template entries

Signed-off-by: Klaus Smolin <smolin@de.ibm.com>
---
 roles/dns/tasks/main.yaml      | 6 ------
 roles/dns/templates/dns.db.j2  | 2 +-
 roles/dns/templates/dns.rev.j2 | 6 +++---
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/roles/dns/tasks/main.yaml b/roles/dns/tasks/main.yaml
index 4e565e16..59edd168 100644
--- a/roles/dns/tasks/main.yaml
+++ b/roles/dns/tasks/main.yaml
@@ -6,12 +6,6 @@
     name: named
     enabled: yes
 
-- name: Start named
-  tags: dns
-  ansible.builtin.systemd:
-    name: named
-    state: started
-
 - name: Split IP addresses for use in templates
   tags: dns
   ansible.builtin.set_fact:
diff --git a/roles/dns/templates/dns.db.j2 b/roles/dns/templates/dns.db.j2
index c2b0b442..c2fdfbed 100644
--- a/roles/dns/templates/dns.db.j2
+++ b/roles/dns/templates/dns.db.j2
@@ -11,7 +11,7 @@ $TTL 1D
 @ IN NS {{ env.bastion.networking.hostname }}.{{ env.bastion.networking.base_domain }}.
 
 ;IP Address for Name Server
-{{ env.bastion.networking.hostname }} IN A {{ env.bastion.networking.ip }}
+{{ env.bastion.networking.hostname }}.{{ env.bastion.networking.base_domain }}. IN A {{ env.bastion.networking.ip }}
 
 ;entry for bootstrap host.
 {{ env.cluster.nodes.bootstrap.hostname }}.{{ env.cluster.networking.metadata_name }}.{{ env.cluster.networking.base_domain }}. IN A {{ env.cluster.nodes.bootstrap.ip }}
diff --git a/roles/dns/templates/dns.rev.j2 b/roles/dns/templates/dns.rev.j2
index d7c60e89..4210bed8 100644
--- a/roles/dns/templates/dns.rev.j2
+++ b/roles/dns/templates/dns.rev.j2
@@ -1,5 +1,5 @@
 $TTL 1D
-@ IN SOA {{ env.bastion.networking.hostname }}.{{ env.cluster.networking.base_domain }}. root (
+@ IN SOA {{ env.bastion.networking.hostname }}.{{ env.bastion.networking.base_domain }}. root (
                                             2020011800 ;Serial
                                             3600 ;Refresh
                                             1800 ;Retry
@@ -7,10 +7,10 @@ $TTL 1D
                                             1D ;Minimum TTL
 )
 ;Name Server Information
-@ IN NS {{ env.bastion.networking.hostname }}.{{ env.cluster.networking.base_domain }}.
+@ IN NS {{ env.bastion.networking.hostname }}.{{ env.bastion.networking.base_domain }}.
 
 ;Reverse lookup for Name Server
-{{ bastion_split_ip.3 }} IN PTR {{ env.bastion.networking.hostname }}.{{ env.cluster.networking.base_domain }}.
+{{ bastion_split_ip.3 }} IN PTR {{ env.bastion.networking.hostname }}.{{ env.bastion.networking.base_domain }}.
 
 ;PTR Record IP address to Hostname
 {{ bootstrap_split_ip.3 }}     IN      PTR     {{ env.cluster.nodes.bootstrap.hostname }}.{{ env.cluster.networking.metadata_name }}.{{ env.cluster.networking.base_domain }}.