Merge branch 'develop' into neoloc/consul_wan

Conflicts: hieradata/common.yaml
2024-05-05 18:01:41 +10:00
parent 8a241d6b96 31f670ad18
commit 14a56a41a2
21 changed files with 271 additions and 218 deletions
@@ -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'
@@ -0,0 +1,4 @@
+---
+profiles::puppet::server::dns_alt_names:
+  - puppetca.main.unkin.net
+  - puppetca
@@ -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'
@@ -0,0 +1,4 @@
+---
+profiles::puppet::server::dns_alt_names:
+  - puppetca.main.unkin.net
+  - puppetca