chore: Changed reverse DNS setup

Signed-off-by: Klaus Smolin <[email protected]>
smolin-de · Jul 25, 2024 · 86718db · 86718db
1 parent 28a6aad
commit 86718db
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/roles/dns/tasks/main.yaml b/roles/dns/tasks/main.yaml
@@ -20,7 +20,6 @@
     owner: root
     group: root
     mode: "0644"
-    backup: yes
 
 - name: Template DNS forwarding file to bastion
   tags: dns
@@ -30,7 +29,6 @@
     owner: named
     group: named
     mode: "0644"
-    backup: yes
 
 - name: Add control nodes to DNS forwarding file on bastion
   tags: dns
@@ -75,14 +73,13 @@
     owner: named
     group: named
     mode: "0644"
-    backup: yes
 
 - name: Add control nodes to DNS reverse lookup file on bastion
   tags: dns
   ansible.builtin.lineinfile:
     path: /var/named/{{ env.cluster.networking.metadata_name }}.rev
     insertafter: "PTR Record IP address to Hostname"
-    line: "{{ env.cluster.nodes.control.ip[i].split('.').3 }}     IN      PTR     {{ env.cluster.nodes.control.hostname[i] }}.{{ env.cluster.networking.metadata_name }}.{{ env.cluster.networking.base_domain }}."
+    line: "{{ env.cluster.nodes.control.ip[i].split('.').3 }}.{{ env.cluster.nodes.control.ip[i].split('.').2 }}     IN      PTR     {{ env.cluster.nodes.control.hostname[i] }}.{{ env.cluster.networking.metadata_name }}.{{ env.cluster.networking.base_domain }}."
   with_sequence: start=0 end={{ (env.cluster.nodes.control.hostname | length) - 1 }} stride=1
   loop_control:
     extended: yes
@@ -93,7 +90,7 @@
   ansible.builtin.lineinfile:
     path: /var/named/{{ env.cluster.networking.metadata_name }}.rev
     insertafter: "PTR Record IP address to Hostname"
-    line: "{{ env.cluster.nodes.compute.ip[i].split('.').3 }}     IN      PTR     {{ env.cluster.nodes.compute.hostname[i] }}.{{ env.cluster.networking.metadata_name }}.{{ env.cluster.networking.base_domain }}."
+    line: "{{ env.cluster.nodes.compute.ip[i].split('.').3 }}.{{ env.cluster.nodes.compute.ip[i].split('.').2 }}     IN      PTR     {{ env.cluster.nodes.compute.hostname[i] }}.{{ env.cluster.networking.metadata_name }}.{{ env.cluster.networking.base_domain }}."
   with_sequence: start=0 end={{ (env.cluster.nodes.compute.hostname | length) - 1 }} stride=1
   loop_control:
     extended: yes
@@ -105,7 +102,7 @@
   ansible.builtin.lineinfile:
     path: /var/named/{{ env.cluster.networking.metadata_name }}.rev
     insertafter: "PTR Record IP address to Hostname"
-    line: "{{ env.cluster.nodes.infra.ip[i].split('.').3 }}     IN      PTR     {{ env.cluster.nodes.infra.hostname[i] }}.{{ env.cluster.networking.metadata_name }}.{{ env.cluster.networking.base_domain }}."
+    line: "{{ env.cluster.nodes.infra.ip[i].split('.').3 }}.{{ env.cluster.nodes.infra.ip[i].split('.').2 }}     IN      PTR     {{ env.cluster.nodes.infra.hostname[i] }}.{{ env.cluster.networking.metadata_name }}.{{ env.cluster.networking.base_domain }}."
   with_sequence: start=0 end={{ (env.cluster.nodes.infra.hostname | length) - 1 }} stride=1
   loop_control:
     extended: yes

diff --git a/roles/dns/templates/dns-named.conf.j2 b/roles/dns/templates/dns-named.conf.j2
@@ -68,7 +68,7 @@ zone "{{ env.cluster.networking.base_domain }}" IN {
 };
 
 //backward zone
-zone "{{ bastion_split_ip.2 }}.{{ bastion_split_ip.1 }}.{{ bastion_split_ip.0 }}.in-addr.arpa" IN {
+zone "{{ bastion_split_ip.1 }}.{{ bastion_split_ip.0 }}.in-addr.arpa" IN {
      type master;
      file "/var/named/{{ env.cluster.networking.metadata_name }}.rev";
      allow-update { any; };

diff --git a/roles/dns/templates/dns.rev.j2 b/roles/dns/templates/dns.rev.j2
@@ -10,9 +10,9 @@ $TTL 1D
 @ 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.bastion.networking.base_domain }}.
+{{ bastion_split_ip.3 }}.{{ bastion_split_ip.2 }} 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 }}.
-{{ bastion_split_ip.3 }}     IN      PTR     api-int.{{ env.cluster.networking.metadata_name }}.{{ env.cluster.networking.base_domain }}.
-{{ bastion_split_ip.3 }}     IN      PTR     api.{{ env.cluster.networking.metadata_name }}.{{ env.cluster.networking.base_domain }}.
+{{ bootstrap_split_ip.3 }}.{{ bootstrap_split_ip.2 }}     IN      PTR     {{ env.cluster.nodes.bootstrap.hostname }}.{{ env.cluster.networking.metadata_name }}.{{ env.cluster.networking.base_domain }}.
+{{ bastion_split_ip.3 }}.{{ bastion_split_ip.2 }}     IN      PTR     api-int.{{ env.cluster.networking.metadata_name }}.{{ env.cluster.networking.base_domain }}.
+{{ bastion_split_ip.3 }}.{{ bastion_split_ip.2 }}     IN      PTR     api.{{ env.cluster.networking.metadata_name }}.{{ env.cluster.networking.base_domain }}.