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 +13 -4
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit dbe11323c5 - Show all commits

1
hieradata/common.yaml
View File

@ -57,6 +57,7 @@ profiles::base::puppet_servers:
profiles::dns::master::basedir: '/var/named/sources' profiles::dns::master::basedir: '/var/named/sources'
profiles::dns::base::ns_role: 'roles::infra::dns::resolver' profiles::dns::base::ns_role: 'roles::infra::dns::resolver'
profiles::dns::base::use_ns: 'region'
profiles::packages::install: profiles::packages::install:
- bash-completion - bash-completion

16
site/profiles/manifests/dns/base.pp
View File

@ -3,16 +3,24 @@ class profiles::dns::base (
String $ns_role = undef, String $ns_role = undef,
Array $search = [], Array $search = [],
Array $nameservers = ['8.8.8.8', '1.1.1.1'], Array $nameservers = ['8.8.8.8', '1.1.1.1'],
Enum[
'all',
'region',
'country'
] $use_ns = 'all',
){ ){
# install bind_utils # install bind_utils
include bind::updater include bind::updater
# if ns_role is set, find all hosts matching that enc_role # if ns_role is set, find all hosts matching that enc_role
if $ns_role == undef { $nameserver_array = $ns_role ? {
$nameserver_array = $nameservers undef => $nameservers,
}else{ default => $use_ns ? {
$nameserver_array = query_nodes("enc_role='${ns_role}'", 'networking.ip') 'all' => query_nodes("enc_role='${ns_role}'", 'networking.ip'),
'region' => query_nodes("enc_role='${ns_role}' and region=${facts['region']}", 'networking.ip'),
'country' => query_nodes("enc_role='${ns_role}' and country=${facts['country']}", 'networking.ip'),
}
} }
# if search is undef, fallback to domainname from facts # if search is undef, fallback to domainname from facts