From 7ee70f21faddca9389f378707ca63065b1e14f42 Mon Sep 17 00:00:00 2001 From: Ben Vincent Date: Sun, 11 May 2025 19:14:30 +1000 Subject: [PATCH] chore: use alias for nameservers - use an alias for nameservers for dhcp ranges - move aliased nameservers to region-wide hiera --- hieradata/country/au/region/drw1.yaml | 7 +++++++ .../au/region/drw1/infra/dns/resolver.yaml | 7 ------- hieradata/country/au/region/syd1.yaml | 4 ++++ .../au/region/syd1/infra/dns/resolver.yaml | 4 ---- hieradata/roles/infra/dhcp/server.yaml | 20 +++++-------------- 5 files changed, 16 insertions(+), 26 deletions(-) diff --git a/hieradata/country/au/region/drw1.yaml b/hieradata/country/au/region/drw1.yaml index 703d863..712da42 100644 --- a/hieradata/country/au/region/drw1.yaml +++ b/hieradata/country/au/region/drw1.yaml @@ -1,2 +1,9 @@ --- timezone::timezone: 'Australia/Darwin' +profiles_dns_upstream_forwarder_unkin: + - 198.18.17.23 + - 198.18.17.24 +profiles_dns_upstream_forwarder_consul: + - 198.18.17.34 + - 198.18.17.35 + - 198.18.17.36 diff --git a/hieradata/country/au/region/drw1/infra/dns/resolver.yaml b/hieradata/country/au/region/drw1/infra/dns/resolver.yaml index ae1582f..ed97d53 100644 --- a/hieradata/country/au/region/drw1/infra/dns/resolver.yaml +++ b/hieradata/country/au/region/drw1/infra/dns/resolver.yaml @@ -1,8 +1 @@ --- -profiles_dns_upstream_forwarder_unkin: - - 198.18.17.23 - - 198.18.17.24 -profiles_dns_upstream_forwarder_consul: - - 198.18.17.34 - - 198.18.17.35 - - 198.18.17.36 diff --git a/hieradata/country/au/region/syd1.yaml b/hieradata/country/au/region/syd1.yaml index 4175d66..2d28c82 100644 --- a/hieradata/country/au/region/syd1.yaml +++ b/hieradata/country/au/region/syd1.yaml @@ -1,3 +1,7 @@ --- timezone::timezone: 'Australia/Sydney' certbot::client::webserver: ausyd1nxvm1021.main.unkin.net +profiles_dns_upstream_forwarder_unkin: + - 198.18.19.15 +profiles_dns_upstream_forwarder_consul: + - 198.18.19.14 diff --git a/hieradata/country/au/region/syd1/infra/dns/resolver.yaml b/hieradata/country/au/region/syd1/infra/dns/resolver.yaml index 740336c..ed97d53 100644 --- a/hieradata/country/au/region/syd1/infra/dns/resolver.yaml +++ b/hieradata/country/au/region/syd1/infra/dns/resolver.yaml @@ -1,5 +1 @@ --- -profiles_dns_upstream_forwarder_unkin: - - 198.18.19.15 -profiles_dns_upstream_forwarder_consul: - - 198.18.19.14 diff --git a/hieradata/roles/infra/dhcp/server.yaml b/hieradata/roles/infra/dhcp/server.yaml index a186d6c..8dc6d38 100644 --- a/hieradata/roles/infra/dhcp/server.yaml +++ b/hieradata/roles/infra/dhcp/server.yaml @@ -15,9 +15,7 @@ profiles::dhcp::server::pools: range: - '198.18.15.200 198.18.15.220' gateway: 198.18.15.254 - nameservers: - - 198.18.13.12 - - 198.18.13.13 + nameservers: "%{alias('profiles_dns_upstream_forwarder_unkin')}" domain_name: main.unkin.net pxeserver: 198.18.13.27 syd1-test: @@ -26,9 +24,7 @@ profiles::dhcp::server::pools: range: - '198.18.16.200 198.18.16.220' gateway: 198.18.16.254 - nameservers: - - 198.18.13.12 - - 198.18.13.13 + nameservers: "%{alias('profiles_dns_upstream_forwarder_unkin')}" domain_name: main.unkin.net pxeserver: 198.18.13.27 syd1-prod1: @@ -37,9 +33,7 @@ profiles::dhcp::server::pools: range: - '198.18.13.200 198.18.13.220' gateway: 198.18.13.254 - nameservers: - - 198.18.13.12 - - 198.18.13.13 + nameservers: "%{alias('profiles_dns_upstream_forwarder_unkin')}" domain_name: main.unkin.net pxeserver: 198.18.13.27 syd1-prod2: @@ -48,9 +42,7 @@ profiles::dhcp::server::pools: range: - '198.18.14.200 198.18.14.220' gateway: 198.18.14.254 - nameservers: - - 198.18.13.12 - - 198.18.13.13 + nameservers: "%{alias('profiles_dns_upstream_forwarder_unkin')}" domain_name: main.unkin.net pxeserver: 198.18.13.27 drw1-prod: @@ -59,9 +51,7 @@ profiles::dhcp::server::pools: range: - '198.18.17.200 198.18.17.220' gateway: 198.18.17.1 - nameservers: - - 198.18.17.7 - - 198.18.17.8 + nameservers: "%{alias('profiles_dns_upstream_forwarder_unkin')}" domain_name: main.unkin.net pxeserver: 198.18.13.27