From 945d60471807315a3febdb99b431b06293c48875 Mon Sep 17 00:00:00 2001
From: Mrugesh Mohapatra <noreply@mrugesh.dev>
Date: Sun, 16 Jul 2023 11:36:54 +0530
Subject: [PATCH] feat: add a subdomain for A records

---
 terraform/ops-cluster-o11y/main.tf                   | 12 ++++++------
 terraform/ops-test/main.tf                           |  4 ++--
 terraform/prd-cluster-publish/main.tf                | 12 ++++++------
 terraform/stg-cluster-oldeworld/next-01-nginx.tf     |  6 +++---
 .../stg-cluster-oldeworld/next-02-nginx-origins.tf   |  2 +-
 .../stg-cluster-oldeworld/next-11-client-eng.tf      |  6 +++---
 .../stg-cluster-oldeworld/next-12-client-chn.tf      |  6 +++---
 .../stg-cluster-oldeworld/next-13-client-cnt.tf      |  6 +++---
 .../stg-cluster-oldeworld/next-14-client-esp.tf      |  6 +++---
 .../stg-cluster-oldeworld/next-15-client-ger.tf      |  6 +++---
 .../stg-cluster-oldeworld/next-16-client-ita.tf      |  6 +++---
 .../stg-cluster-oldeworld/next-17-client-jpn.tf      |  6 +++---
 .../stg-cluster-oldeworld/next-18-client-por.tf      |  6 +++---
 .../stg-cluster-oldeworld/next-19-client-ukr.tf      |  6 +++---
 terraform/stg-cluster-oldeworld/next-20-api.tf       |  6 +++---
 terraform/stg-cluster-oldeworld/next-50-ghost.tf     |  6 +++---
 16 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/terraform/ops-cluster-o11y/main.tf b/terraform/ops-cluster-o11y/main.tf
index 9dba73551..005cbd477 100644
--- a/terraform/ops-cluster-o11y/main.tf
+++ b/terraform/ops-cluster-o11y/main.tf
@@ -99,7 +99,7 @@ resource "linode_domain_record" "ops_o11y_leaders_dnsrecord__vlan" {
   count = var.leader_node_count
 
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "ldr-${count.index + 1}.o11y"
+  name        = "ldr-${count.index + 1}.o11y.${var.network_subdomain}"
   record_type = "A"
   target      = trimsuffix(linode_instance_config.ops_o11y_leaders_config[count.index].interface[1].ipam_address, "/24")
   ttl_sec     = 120
@@ -109,7 +109,7 @@ resource "linode_domain_record" "ops_o11y_leaders_dnsrecord__public" {
   count = var.leader_node_count
 
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "pub.ldr-${count.index + 1}.o11y"
+  name        = "pub.ldr-${count.index + 1}.o11y.${var.network_subdomain}"
   record_type = "A"
   target      = linode_instance.ops_o11y_leaders[count.index].ip_address
   ttl_sec     = 120
@@ -119,7 +119,7 @@ resource "linode_domain_record" "ops_o11y_leaders_dnsrecord__private" {
   count = var.leader_node_count
 
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "prv.ldr-${count.index + 1}.o11y"
+  name        = "prv.ldr-${count.index + 1}.o11y.${var.network_subdomain}"
   record_type = "A"
   target      = linode_instance.ops_o11y_leaders[count.index].private_ip_address
   ttl_sec     = 120
@@ -204,7 +204,7 @@ resource "linode_domain_record" "ops_o11y_workers_dnsrecord__vlan" {
   count = var.worker_node_count
 
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "wkr-${count.index + 1}.o11y"
+  name        = "wkr-${count.index + 1}.o11y.${var.network_subdomain}"
   record_type = "A"
   target      = trimsuffix(linode_instance_config.ops_o11y_workers_config[count.index].interface[1].ipam_address, "/24")
   ttl_sec     = 120
@@ -214,7 +214,7 @@ resource "linode_domain_record" "ops_o11y_workers_dnsrecord__public" {
   count = var.worker_node_count
 
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "pub.wkr-${count.index + 1}.o11y"
+  name        = "pub.wkr-${count.index + 1}.o11y.${var.network_subdomain}"
   record_type = "A"
   target      = linode_instance.ops_o11y_workers[count.index].ip_address
   ttl_sec     = 120
@@ -224,7 +224,7 @@ resource "linode_domain_record" "ops_o11y_workers_dnsrecord__private" {
   count = var.worker_node_count
 
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "prv.wkr-${count.index + 1}.o11y"
+  name        = "prv.wkr-${count.index + 1}.o11y.${var.network_subdomain}"
   record_type = "A"
   target      = linode_instance.ops_o11y_workers[count.index].private_ip_address
   ttl_sec     = 120
diff --git a/terraform/ops-test/main.tf b/terraform/ops-test/main.tf
index 80a1e3782..430d5ab78 100644
--- a/terraform/ops-test/main.tf
+++ b/terraform/ops-test/main.tf
@@ -92,7 +92,7 @@ resource "linode_instance_config" "ops_test_config" {
 
 resource "linode_domain_record" "ops_test_records" {
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "test"
+  name        = "test.${var.network_subdomain}"
   record_type = "A"
   target      = linode_instance.ops_test.ip_address
   ttl_sec     = 120
@@ -100,7 +100,7 @@ resource "linode_domain_record" "ops_test_records" {
 
 resource "linode_domain_record" "ops_test_dnsrecord__public" {
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "pub.test"
+  name        = "pub.test.${var.network_subdomain}"
   record_type = "A"
   target      = linode_instance.ops_test.ip_address
   ttl_sec     = 120
diff --git a/terraform/prd-cluster-publish/main.tf b/terraform/prd-cluster-publish/main.tf
index 0d1a96d3d..dee260568 100644
--- a/terraform/prd-cluster-publish/main.tf
+++ b/terraform/prd-cluster-publish/main.tf
@@ -99,7 +99,7 @@ resource "linode_domain_record" "prd_publish_leaders_dnsrecord__vlan" {
   count = var.leader_node_count
 
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "ldr-${count.index + 1}.publish.prd"
+  name        = "ldr-${count.index + 1}.publish.prd.${var.network_subdomain}"
   record_type = "A"
   target      = trimsuffix(linode_instance_config.prd_publish_leaders_config[count.index].interface[1].ipam_address, "/24")
   ttl_sec     = 120
@@ -109,7 +109,7 @@ resource "linode_domain_record" "prd_publish_leaders_dnsrecord__public" {
   count = var.leader_node_count
 
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "pub.ldr-${count.index + 1}.publish.prd"
+  name        = "pub.ldr-${count.index + 1}.publish.prd.${var.network_subdomain}"
   record_type = "A"
   target      = linode_instance.prd_publish_leaders[count.index].ip_address
   ttl_sec     = 120
@@ -119,7 +119,7 @@ resource "linode_domain_record" "prd_publish_leaders_dnsrecord__private" {
   count = var.leader_node_count
 
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "prv.ldr-${count.index + 1}.publish.prd"
+  name        = "prv.ldr-${count.index + 1}.publish.prd.${var.network_subdomain}"
   record_type = "A"
   target      = linode_instance.prd_publish_leaders[count.index].private_ip_address
   ttl_sec     = 120
@@ -204,7 +204,7 @@ resource "linode_domain_record" "prd_publish_workers_dnsrecord__vlan" {
   count = var.worker_node_count
 
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "wkr-${count.index + 1}.publish.prd"
+  name        = "wkr-${count.index + 1}.publish.prd.${var.network_subdomain}"
   record_type = "A"
   target      = trimsuffix(linode_instance_config.prd_publish_workers_config[count.index].interface[1].ipam_address, "/24")
   ttl_sec     = 120
@@ -214,7 +214,7 @@ resource "linode_domain_record" "prd_publish_workers_dnsrecord__public" {
   count = var.worker_node_count
 
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "pub.wkr-${count.index + 1}.publish.prd"
+  name        = "pub.wkr-${count.index + 1}.publish.prd.${var.network_subdomain}"
   record_type = "A"
   target      = linode_instance.prd_publish_workers[count.index].ip_address
   ttl_sec     = 120
@@ -224,7 +224,7 @@ resource "linode_domain_record" "prd_publish_workers_dnsrecord__private" {
   count = var.worker_node_count
 
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "prv.wkr-${count.index + 1}.publish.prd"
+  name        = "prv.wkr-${count.index + 1}.publish.prd.${var.network_subdomain}"
   record_type = "A"
   target      = linode_instance.prd_publish_workers[count.index].private_ip_address
   ttl_sec     = 120
diff --git a/terraform/stg-cluster-oldeworld/next-01-nginx.tf b/terraform/stg-cluster-oldeworld/next-01-nginx.tf
index c0573ed77..6c388d9f5 100644
--- a/terraform/stg-cluster-oldeworld/next-01-nginx.tf
+++ b/terraform/stg-cluster-oldeworld/next-01-nginx.tf
@@ -77,7 +77,7 @@ resource "linode_domain_record" "stg_oldeworld_pxy_dnsrecord__vlan" {
   count = local.pxy_node_count
 
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "pxy-${count.index + 1}.oldeworld.stg"
+  name        = "pxy-${count.index + 1}.oldeworld.stg.${var.network_subdomain}"
   record_type = "A"
   target      = trimsuffix(linode_instance_config.stg_oldeworld_pxy_config[count.index].interface[1].ipam_address, "/24")
   ttl_sec     = 120
@@ -87,7 +87,7 @@ resource "linode_domain_record" "stg_oldeworld_pxy_dnsrecord__public" {
   count = local.pxy_node_count
 
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "pub.pxy-${count.index + 1}.oldeworld.stg"
+  name        = "pub.pxy-${count.index + 1}.oldeworld.stg.${var.network_subdomain}"
   record_type = "A"
   target      = linode_instance.stg_oldeworld_pxy[count.index].ip_address
   ttl_sec     = 120
@@ -97,7 +97,7 @@ resource "linode_domain_record" "stg_oldeworld_pxy_dnsrecord__private" {
   count = local.pxy_node_count
 
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "prv.pxy-${count.index + 1}.oldeworld.stg"
+  name        = "prv.pxy-${count.index + 1}.oldeworld.stg.${var.network_subdomain}"
   record_type = "A"
   target      = linode_instance.stg_oldeworld_pxy[count.index].private_ip_address
   ttl_sec     = 120
diff --git a/terraform/stg-cluster-oldeworld/next-02-nginx-origins.tf b/terraform/stg-cluster-oldeworld/next-02-nginx-origins.tf
index 78fdeeb22..ab7e35321 100644
--- a/terraform/stg-cluster-oldeworld/next-02-nginx-origins.tf
+++ b/terraform/stg-cluster-oldeworld/next-02-nginx-origins.tf
@@ -32,7 +32,7 @@ resource "linode_nodebalancer_node" "stg_oldeworld_nb_pxy_nodes__port_80" {
 
 resource "linode_domain_record" "stg_oldeworld_nb_pxy_dnsrecord__public" {
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "oldeworld.stg"
+  name        = "oldeworld.stg.${var.network_subdomain}"
   record_type = "A"
   target      = data.linode_nodebalancer.stg_oldeworld_nb_pxy.ipv4
   ttl_sec     = 120
diff --git a/terraform/stg-cluster-oldeworld/next-11-client-eng.tf b/terraform/stg-cluster-oldeworld/next-11-client-eng.tf
index 2e2297f21..e59e9cec6 100644
--- a/terraform/stg-cluster-oldeworld/next-11-client-eng.tf
+++ b/terraform/stg-cluster-oldeworld/next-11-client-eng.tf
@@ -77,7 +77,7 @@ resource "linode_domain_record" "stg_oldeworld_clteng_dnsrecord__vlan" {
   count = local.clteng_node_count
 
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "clteng-${count.index + 1}.oldeworld.stg"
+  name        = "clteng-${count.index + 1}.oldeworld.stg.${var.network_subdomain}"
   record_type = "A"
   target      = trimsuffix(linode_instance_config.stg_oldeworld_clteng_config[count.index].interface[1].ipam_address, "/24")
   ttl_sec     = 120
@@ -87,7 +87,7 @@ resource "linode_domain_record" "stg_oldeworld_clteng_dnsrecord__public" {
   count = local.clteng_node_count
 
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "pub.clteng-${count.index + 1}.oldeworld.stg"
+  name        = "pub.clteng-${count.index + 1}.oldeworld.stg.${var.network_subdomain}"
   record_type = "A"
   target      = linode_instance.stg_oldeworld_clteng[count.index].ip_address
   ttl_sec     = 120
@@ -97,7 +97,7 @@ resource "linode_domain_record" "stg_oldeworld_clteng_dnsrecord__private" {
   count = local.clteng_node_count
 
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "prv.clteng-${count.index + 1}.oldeworld.stg"
+  name        = "prv.clteng-${count.index + 1}.oldeworld.stg.${var.network_subdomain}"
   record_type = "A"
   target      = linode_instance.stg_oldeworld_clteng[count.index].private_ip_address
   ttl_sec     = 120
diff --git a/terraform/stg-cluster-oldeworld/next-12-client-chn.tf b/terraform/stg-cluster-oldeworld/next-12-client-chn.tf
index 47bb14f23..2052d7c01 100644
--- a/terraform/stg-cluster-oldeworld/next-12-client-chn.tf
+++ b/terraform/stg-cluster-oldeworld/next-12-client-chn.tf
@@ -77,7 +77,7 @@ resource "linode_domain_record" "stg_oldeworld_cltchn_dnsrecord__vlan" {
   count = local.cltchn_node_count
 
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "cltchn-${count.index + 1}.oldeworld.stg"
+  name        = "cltchn-${count.index + 1}.oldeworld.stg.${var.network_subdomain}"
   record_type = "A"
   target      = trimsuffix(linode_instance_config.stg_oldeworld_cltchn_config[count.index].interface[1].ipam_address, "/24")
   ttl_sec     = 120
@@ -87,7 +87,7 @@ resource "linode_domain_record" "stg_oldeworld_cltchn_dnsrecord__public" {
   count = local.cltchn_node_count
 
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "pub.cltchn-${count.index + 1}.oldeworld.stg"
+  name        = "pub.cltchn-${count.index + 1}.oldeworld.stg.${var.network_subdomain}"
   record_type = "A"
   target      = linode_instance.stg_oldeworld_cltchn[count.index].ip_address
   ttl_sec     = 120
@@ -97,7 +97,7 @@ resource "linode_domain_record" "stg_oldeworld_cltchn_dnsrecord__private" {
   count = local.cltchn_node_count
 
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "prv.cltchn-${count.index + 1}.oldeworld.stg"
+  name        = "prv.cltchn-${count.index + 1}.oldeworld.stg.${var.network_subdomain}"
   record_type = "A"
   target      = linode_instance.stg_oldeworld_cltchn[count.index].private_ip_address
   ttl_sec     = 120
diff --git a/terraform/stg-cluster-oldeworld/next-13-client-cnt.tf b/terraform/stg-cluster-oldeworld/next-13-client-cnt.tf
index dce059b89..7c46715f3 100644
--- a/terraform/stg-cluster-oldeworld/next-13-client-cnt.tf
+++ b/terraform/stg-cluster-oldeworld/next-13-client-cnt.tf
@@ -77,7 +77,7 @@ resource "linode_domain_record" "stg_oldeworld_cltcnt_dnsrecord__vlan" {
   count = local.cltcnt_node_count
 
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "cltcnt-${count.index + 1}.oldeworld.stg"
+  name        = "cltcnt-${count.index + 1}.oldeworld.stg.${var.network_subdomain}"
   record_type = "A"
   target      = trimsuffix(linode_instance_config.stg_oldeworld_cltcnt_config[count.index].interface[1].ipam_address, "/24")
   ttl_sec     = 120
@@ -87,7 +87,7 @@ resource "linode_domain_record" "stg_oldeworld_cltcnt_dnsrecord__public" {
   count = local.cltcnt_node_count
 
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "pub.cltcnt-${count.index + 1}.oldeworld.stg"
+  name        = "pub.cltcnt-${count.index + 1}.oldeworld.stg.${var.network_subdomain}"
   record_type = "A"
   target      = linode_instance.stg_oldeworld_cltcnt[count.index].ip_address
   ttl_sec     = 120
@@ -97,7 +97,7 @@ resource "linode_domain_record" "stg_oldeworld_cltcnt_dnsrecord__private" {
   count = local.cltcnt_node_count
 
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "prv.cltcnt-${count.index + 1}.oldeworld.stg"
+  name        = "prv.cltcnt-${count.index + 1}.oldeworld.stg.${var.network_subdomain}"
   record_type = "A"
   target      = linode_instance.stg_oldeworld_cltcnt[count.index].private_ip_address
   ttl_sec     = 120
diff --git a/terraform/stg-cluster-oldeworld/next-14-client-esp.tf b/terraform/stg-cluster-oldeworld/next-14-client-esp.tf
index e396da0cd..ca82f3da9 100644
--- a/terraform/stg-cluster-oldeworld/next-14-client-esp.tf
+++ b/terraform/stg-cluster-oldeworld/next-14-client-esp.tf
@@ -77,7 +77,7 @@ resource "linode_domain_record" "stg_oldeworld_cltesp_dnsrecord__vlan" {
   count = local.cltesp_node_count
 
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "cltesp-${count.index + 1}.oldeworld.stg"
+  name        = "cltesp-${count.index + 1}.oldeworld.stg.${var.network_subdomain}"
   record_type = "A"
   target      = trimsuffix(linode_instance_config.stg_oldeworld_cltesp_config[count.index].interface[1].ipam_address, "/24")
   ttl_sec     = 120
@@ -87,7 +87,7 @@ resource "linode_domain_record" "stg_oldeworld_cltesp_dnsrecord__public" {
   count = local.cltesp_node_count
 
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "pub.cltesp-${count.index + 1}.oldeworld.stg"
+  name        = "pub.cltesp-${count.index + 1}.oldeworld.stg.${var.network_subdomain}"
   record_type = "A"
   target      = linode_instance.stg_oldeworld_cltesp[count.index].ip_address
   ttl_sec     = 120
@@ -97,7 +97,7 @@ resource "linode_domain_record" "stg_oldeworld_cltesp_dnsrecord__private" {
   count = local.cltesp_node_count
 
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "prv.cltesp-${count.index + 1}.oldeworld.stg"
+  name        = "prv.cltesp-${count.index + 1}.oldeworld.stg.${var.network_subdomain}"
   record_type = "A"
   target      = linode_instance.stg_oldeworld_cltesp[count.index].private_ip_address
   ttl_sec     = 120
diff --git a/terraform/stg-cluster-oldeworld/next-15-client-ger.tf b/terraform/stg-cluster-oldeworld/next-15-client-ger.tf
index ac4c8c20d..c620d6660 100644
--- a/terraform/stg-cluster-oldeworld/next-15-client-ger.tf
+++ b/terraform/stg-cluster-oldeworld/next-15-client-ger.tf
@@ -77,7 +77,7 @@ resource "linode_domain_record" "stg_oldeworld_cltger_dnsrecord__vlan" {
   count = local.cltger_node_count
 
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "cltger-${count.index + 1}.oldeworld.stg"
+  name        = "cltger-${count.index + 1}.oldeworld.stg.${var.network_subdomain}"
   record_type = "A"
   target      = trimsuffix(linode_instance_config.stg_oldeworld_cltger_config[count.index].interface[1].ipam_address, "/24")
   ttl_sec     = 120
@@ -87,7 +87,7 @@ resource "linode_domain_record" "stg_oldeworld_cltger_dnsrecord__public" {
   count = local.cltger_node_count
 
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "pub.cltger-${count.index + 1}.oldeworld.stg"
+  name        = "pub.cltger-${count.index + 1}.oldeworld.stg.${var.network_subdomain}"
   record_type = "A"
   target      = linode_instance.stg_oldeworld_cltger[count.index].ip_address
   ttl_sec     = 120
@@ -97,7 +97,7 @@ resource "linode_domain_record" "stg_oldeworld_cltger_dnsrecord__private" {
   count = local.cltger_node_count
 
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "prv.cltger-${count.index + 1}.oldeworld.stg"
+  name        = "prv.cltger-${count.index + 1}.oldeworld.stg.${var.network_subdomain}"
   record_type = "A"
   target      = linode_instance.stg_oldeworld_cltger[count.index].private_ip_address
   ttl_sec     = 120
diff --git a/terraform/stg-cluster-oldeworld/next-16-client-ita.tf b/terraform/stg-cluster-oldeworld/next-16-client-ita.tf
index b33558262..0da64c655 100644
--- a/terraform/stg-cluster-oldeworld/next-16-client-ita.tf
+++ b/terraform/stg-cluster-oldeworld/next-16-client-ita.tf
@@ -77,7 +77,7 @@ resource "linode_domain_record" "stg_oldeworld_cltita_dnsrecord__vlan" {
   count = local.cltita_node_count
 
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "cltita-${count.index + 1}.oldeworld.stg"
+  name        = "cltita-${count.index + 1}.oldeworld.stg.${var.network_subdomain}"
   record_type = "A"
   target      = trimsuffix(linode_instance_config.stg_oldeworld_cltita_config[count.index].interface[1].ipam_address, "/24")
   ttl_sec     = 120
@@ -87,7 +87,7 @@ resource "linode_domain_record" "stg_oldeworld_cltita_dnsrecord__public" {
   count = local.cltita_node_count
 
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "pub.cltita-${count.index + 1}.oldeworld.stg"
+  name        = "pub.cltita-${count.index + 1}.oldeworld.stg.${var.network_subdomain}"
   record_type = "A"
   target      = linode_instance.stg_oldeworld_cltita[count.index].ip_address
   ttl_sec     = 120
@@ -97,7 +97,7 @@ resource "linode_domain_record" "stg_oldeworld_cltita_dnsrecord__private" {
   count = local.cltita_node_count
 
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "prv.cltita-${count.index + 1}.oldeworld.stg"
+  name        = "prv.cltita-${count.index + 1}.oldeworld.stg.${var.network_subdomain}"
   record_type = "A"
   target      = linode_instance.stg_oldeworld_cltita[count.index].private_ip_address
   ttl_sec     = 120
diff --git a/terraform/stg-cluster-oldeworld/next-17-client-jpn.tf b/terraform/stg-cluster-oldeworld/next-17-client-jpn.tf
index 9a807b49f..56cbdd51a 100644
--- a/terraform/stg-cluster-oldeworld/next-17-client-jpn.tf
+++ b/terraform/stg-cluster-oldeworld/next-17-client-jpn.tf
@@ -77,7 +77,7 @@ resource "linode_domain_record" "stg_oldeworld_cltjpn_dnsrecord__vlan" {
   count = local.cltjpn_node_count
 
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "cltjpn-${count.index + 1}.oldeworld.stg"
+  name        = "cltjpn-${count.index + 1}.oldeworld.stg.${var.network_subdomain}"
   record_type = "A"
   target      = trimsuffix(linode_instance_config.stg_oldeworld_cltjpn_config[count.index].interface[1].ipam_address, "/24")
   ttl_sec     = 120
@@ -87,7 +87,7 @@ resource "linode_domain_record" "stg_oldeworld_cltjpn_dnsrecord__public" {
   count = local.cltjpn_node_count
 
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "pub.cltjpn-${count.index + 1}.oldeworld.stg"
+  name        = "pub.cltjpn-${count.index + 1}.oldeworld.stg.${var.network_subdomain}"
   record_type = "A"
   target      = linode_instance.stg_oldeworld_cltjpn[count.index].ip_address
   ttl_sec     = 120
@@ -97,7 +97,7 @@ resource "linode_domain_record" "stg_oldeworld_cltjpn_dnsrecord__private" {
   count = local.cltjpn_node_count
 
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "prv.cltjpn-${count.index + 1}.oldeworld.stg"
+  name        = "prv.cltjpn-${count.index + 1}.oldeworld.stg.${var.network_subdomain}"
   record_type = "A"
   target      = linode_instance.stg_oldeworld_cltjpn[count.index].private_ip_address
   ttl_sec     = 120
diff --git a/terraform/stg-cluster-oldeworld/next-18-client-por.tf b/terraform/stg-cluster-oldeworld/next-18-client-por.tf
index 7346d2dab..79731fe56 100644
--- a/terraform/stg-cluster-oldeworld/next-18-client-por.tf
+++ b/terraform/stg-cluster-oldeworld/next-18-client-por.tf
@@ -77,7 +77,7 @@ resource "linode_domain_record" "stg_oldeworld_cltpor_dnsrecord__vlan" {
   count = local.cltpor_node_count
 
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "cltpor-${count.index + 1}.oldeworld.stg"
+  name        = "cltpor-${count.index + 1}.oldeworld.stg.${var.network_subdomain}"
   record_type = "A"
   target      = trimsuffix(linode_instance_config.stg_oldeworld_cltpor_config[count.index].interface[1].ipam_address, "/24")
   ttl_sec     = 120
@@ -87,7 +87,7 @@ resource "linode_domain_record" "stg_oldeworld_cltpor_dnsrecord__public" {
   count = local.cltpor_node_count
 
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "pub.cltpor-${count.index + 1}.oldeworld.stg"
+  name        = "pub.cltpor-${count.index + 1}.oldeworld.stg.${var.network_subdomain}"
   record_type = "A"
   target      = linode_instance.stg_oldeworld_cltpor[count.index].ip_address
   ttl_sec     = 120
@@ -97,7 +97,7 @@ resource "linode_domain_record" "stg_oldeworld_cltpor_dnsrecord__private" {
   count = local.cltpor_node_count
 
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "prv.cltpor-${count.index + 1}.oldeworld.stg"
+  name        = "prv.cltpor-${count.index + 1}.oldeworld.stg.${var.network_subdomain}"
   record_type = "A"
   target      = linode_instance.stg_oldeworld_cltpor[count.index].private_ip_address
   ttl_sec     = 120
diff --git a/terraform/stg-cluster-oldeworld/next-19-client-ukr.tf b/terraform/stg-cluster-oldeworld/next-19-client-ukr.tf
index 8f6081f25..5c6608dd8 100644
--- a/terraform/stg-cluster-oldeworld/next-19-client-ukr.tf
+++ b/terraform/stg-cluster-oldeworld/next-19-client-ukr.tf
@@ -77,7 +77,7 @@ resource "linode_domain_record" "stg_oldeworld_cltukr_dnsrecord__vlan" {
   count = local.cltukr_node_count
 
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "cltukr-${count.index + 1}.oldeworld.stg"
+  name        = "cltukr-${count.index + 1}.oldeworld.stg.${var.network_subdomain}"
   record_type = "A"
   target      = trimsuffix(linode_instance_config.stg_oldeworld_cltukr_config[count.index].interface[1].ipam_address, "/24")
   ttl_sec     = 120
@@ -87,7 +87,7 @@ resource "linode_domain_record" "stg_oldeworld_cltukr_dnsrecord__public" {
   count = local.cltukr_node_count
 
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "pub.cltukr-${count.index + 1}.oldeworld.stg"
+  name        = "pub.cltukr-${count.index + 1}.oldeworld.stg.${var.network_subdomain}"
   record_type = "A"
   target      = linode_instance.stg_oldeworld_cltukr[count.index].ip_address
   ttl_sec     = 120
@@ -97,7 +97,7 @@ resource "linode_domain_record" "stg_oldeworld_cltukr_dnsrecord__private" {
   count = local.cltukr_node_count
 
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "prv.cltukr-${count.index + 1}.oldeworld.stg"
+  name        = "prv.cltukr-${count.index + 1}.oldeworld.stg.${var.network_subdomain}"
   record_type = "A"
   target      = linode_instance.stg_oldeworld_cltukr[count.index].private_ip_address
   ttl_sec     = 120
diff --git a/terraform/stg-cluster-oldeworld/next-20-api.tf b/terraform/stg-cluster-oldeworld/next-20-api.tf
index 93a777e78..2da9a653a 100644
--- a/terraform/stg-cluster-oldeworld/next-20-api.tf
+++ b/terraform/stg-cluster-oldeworld/next-20-api.tf
@@ -77,7 +77,7 @@ resource "linode_domain_record" "stg_oldeworld_api_dnsrecord__vlan" {
   count = local.api_node_count
 
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "api-${count.index + 1}.oldeworld.stg"
+  name        = "api-${count.index + 1}.oldeworld.stg.${var.network_subdomain}"
   record_type = "A"
   target      = trimsuffix(linode_instance_config.stg_oldeworld_api_config[count.index].interface[1].ipam_address, "/24")
   ttl_sec     = 120
@@ -87,7 +87,7 @@ resource "linode_domain_record" "stg_oldeworld_api_dnsrecord__public" {
   count = local.api_node_count
 
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "pub.api-${count.index + 1}.oldeworld.stg"
+  name        = "pub.api-${count.index + 1}.oldeworld.stg.${var.network_subdomain}"
   record_type = "A"
   target      = linode_instance.stg_oldeworld_api[count.index].ip_address
   ttl_sec     = 120
@@ -97,7 +97,7 @@ resource "linode_domain_record" "stg_oldeworld_api_dnsrecord__private" {
   count = local.api_node_count
 
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "prv.api-${count.index + 1}.oldeworld.stg"
+  name        = "prv.api-${count.index + 1}.oldeworld.stg.${var.network_subdomain}"
   record_type = "A"
   target      = linode_instance.stg_oldeworld_api[count.index].private_ip_address
   ttl_sec     = 120
diff --git a/terraform/stg-cluster-oldeworld/next-50-ghost.tf b/terraform/stg-cluster-oldeworld/next-50-ghost.tf
index 72d88c0ae..192e99cb7 100644
--- a/terraform/stg-cluster-oldeworld/next-50-ghost.tf
+++ b/terraform/stg-cluster-oldeworld/next-50-ghost.tf
@@ -72,7 +72,7 @@ resource "linode_instance_config" "stg_oldeworld_newstst_config" {
 
 resource "linode_domain_record" "stg_oldeworld_newstst_dnsrecord__vlan" {
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "newstst-1.oldeworld.stg"
+  name        = "newstst-1.oldeworld.stg.${var.network_subdomain}"
   record_type = "A"
   target      = trimsuffix(linode_instance_config.stg_oldeworld_newstst_config.interface[1].ipam_address, "/24")
   ttl_sec     = 120
@@ -80,7 +80,7 @@ resource "linode_domain_record" "stg_oldeworld_newstst_dnsrecord__vlan" {
 
 resource "linode_domain_record" "stg_oldeworld_newstst_dnsrecord__public" {
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "pub.newstst-1.oldeworld.stg"
+  name        = "pub.newstst-1.oldeworld.stg.${var.network_subdomain}"
   record_type = "A"
   target      = linode_instance.stg_oldeworld_newstst.ip_address
   ttl_sec     = 120
@@ -88,7 +88,7 @@ resource "linode_domain_record" "stg_oldeworld_newstst_dnsrecord__public" {
 
 resource "linode_domain_record" "stg_oldeworld_newstst_dnsrecord__private" {
   domain_id   = data.linode_domain.ops_dns_domain.id
-  name        = "prv.newstst-1.oldeworld.stg"
+  name        = "prv.newstst-1.oldeworld.stg.${var.network_subdomain}"
   record_type = "A"
   target      = linode_instance.stg_oldeworld_newstst.private_ip_address
   ttl_sec     = 120