From 51bd1796ad27eda104b611f0f666efe72be8855e Mon Sep 17 00:00:00 2001 From: Ben Vincent Date: Sat, 4 May 2024 16:27:32 +1000 Subject: [PATCH] feat: per-datacentre consul dns - change forwarding for consul to be per-datacentre to local consul - change domain from service.consul -> consul so query.consul can be resolved --- .../country/au/region/drw1/infra/dns/resolver.yaml | 8 ++++++++ .../country/au/region/syd1/infra/dns/resolver.yaml | 8 ++++++++ hieradata/roles/infra/dns/resolver.yaml | 10 +--------- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/hieradata/country/au/region/drw1/infra/dns/resolver.yaml b/hieradata/country/au/region/drw1/infra/dns/resolver.yaml index 49afb06..157667c 100644 --- a/hieradata/country/au/region/drw1/infra/dns/resolver.yaml +++ b/hieradata/country/au/region/drw1/infra/dns/resolver.yaml @@ -42,3 +42,11 @@ profiles::dns::resolver::zones: - 198.18.17.23 - 198.18.17.24 forward: 'only' + consul-forward: + domain: 'consul' + zone_type: 'forward' + forwarders: + - 198.18.17.34 + - 198.18.17.35 + - 198.18.17.36 + forward: 'only' diff --git a/hieradata/country/au/region/syd1/infra/dns/resolver.yaml b/hieradata/country/au/region/syd1/infra/dns/resolver.yaml index ddde7f5..088f065 100644 --- a/hieradata/country/au/region/syd1/infra/dns/resolver.yaml +++ b/hieradata/country/au/region/syd1/infra/dns/resolver.yaml @@ -42,3 +42,11 @@ profiles::dns::resolver::zones: - 198.18.13.14 - 198.18.13.15 forward: 'only' + consul-forward: + domain: 'consul' + zone_type: 'forward' + forwarders: + - 198.18.13.19 + - 198.18.13.20 + - 198.18.13.21 + forward: 'only' diff --git a/hieradata/roles/infra/dns/resolver.yaml b/hieradata/roles/infra/dns/resolver.yaml index ceb8863..10751b9 100644 --- a/hieradata/roles/infra/dns/resolver.yaml +++ b/hieradata/roles/infra/dns/resolver.yaml @@ -61,14 +61,6 @@ profiles::dns::resolver::zones: - 10.10.16.32 - 10.10.16.33 forward: 'only' - service.consul-forward: - domain: 'service.consul' - zone_type: 'forward' - forwarders: - - 198.18.13.19 - - 198.18.13.20 - - 198.18.13.21 - forward: 'only' profiles::dns::resolver::views: openforwarder: @@ -79,7 +71,7 @@ profiles::dns::resolver::views: - dmz.unkin.net-forward - network.unkin.net-forward - prod.unkin.net-forward - - service.consul-forward + - consul-forward - 13.18.198.in-addr.arpa-forward - 14.18.198.in-addr.arpa-forward - 15.18.198.in-addr.arpa-forward