Merge pull request 'feat: per-datacentre consul dns' (#194) from neoloc/consul_dns into develop

Reviewed-on: unkinben/puppet-prod#194

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'

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'

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