unkin/puppet-prod
2
0
Fork 0
Code Issues 10 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into neoloc/consul_services

Browse Source 
Conflicts:
	hieradata/common.yaml
	site/profiles/manifests/consul/client.pp
This commit is contained in:
Ben Vincent 2024-04-28 17:09:18 +10:00
commit 587df5309f
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hieradata/common.yaml
View File

@ -110,7 +110,6 @@ profiles::consul::client::node_rules:
segment: ''
disposition: read
profiles::packages::install:
- bash-completion
- bzip2

6
hieradata/roles/infra/dns/resolver.yaml
View File

@ -61,8 +61,8 @@ profiles::dns::resolver::zones:
- 10.10.16.32
- 10.10.16.33
forward: 'only'
consul.service.consul-forward:
domain: 'consul.service.consul'
service.consul-forward:
domain: 'service.consul'
zone_type: 'forward'
forwarders:
- 198.18.13.19
@ -79,7 +79,7 @@ profiles::dns::resolver::views:
- dmz.unkin.net-forward
- network.unkin.net-forward
- prod.unkin.net-forward
- consul.service.consul-forward
- service.consul-forward
- 13.18.198.in-addr.arpa-forward
- 14.18.198.in-addr.arpa-forward
- 15.18.198.in-addr.arpa-forward