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

promote develop to master #6

Merged
unkinben merged 449 commits from develop into master 2024-06-01 14:48:48 +10:00
Conversation 0 Commits 449 Files Changed 291 +3 -4
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 587df5309f - Show all commits

1
hieradata/common.yaml
View File

@ -110,7 +110,6 @@ profiles::consul::client::node_rules:
segment: '' segment: ''
disposition: read disposition: read
profiles::packages::install: profiles::packages::install:
- bash-completion - bash-completion
- bzip2 - 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.32
- 10.10.16.33 - 10.10.16.33
forward: 'only' forward: 'only'
consul.service.consul-forward: service.consul-forward:
domain: 'consul.service.consul' domain: 'service.consul'
zone_type: 'forward' zone_type: 'forward'
forwarders: forwarders:
- 198.18.13.19 - 198.18.13.19
@ -79,7 +79,7 @@ profiles::dns::resolver::views:
- dmz.unkin.net-forward - dmz.unkin.net-forward
- network.unkin.net-forward - network.unkin.net-forward
- prod.unkin.net-forward - prod.unkin.net-forward
- consul.service.consul-forward - service.consul-forward
- 13.18.198.in-addr.arpa-forward - 13.18.198.in-addr.arpa-forward
- 14.18.198.in-addr.arpa-forward - 14.18.198.in-addr.arpa-forward
- 15.18.198.in-addr.arpa-forward - 15.18.198.in-addr.arpa-forward