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

fix: replace puppetdbquery with native PQL queries

Browse Source 
Replace deprecated dalen-puppetdbquery module with native puppetdb_query
function using PQL syntax to resolve URI.escape compatibility issues.
This is required to migrated to Puppet 8 (and kubernetes).

Changes:
- Remove dalen-puppetdbquery dependency from Puppetfile
- Replace query_nodes() calls with puppetdb_query() using PQL syntax
- Update 27 function calls across 18 Puppet manifests
- Maintain equivalent functionality with improved compatibility
This commit is contained in:
Ben Vincent
2026-03-21 21:54:24 +11:00
parent 1d41d07b2d
commit e58e699ee3
18 changed files with 102 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
site/profiles/manifests/dns/base.pp
+9 -3
View File
@@ -18,9 +18,15 @@ class profiles::dns::base (
$nameserver_array = $ns_role ? {
undef => $nameservers,
default => $use_ns ? {
'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'),
'all' => puppetdb_query(
"inventory[networking.ip] { facts.enc_role = '${ns_role}' }"
).map |$node| { $node['networking.ip'] },
'region' => puppetdb_query(
"inventory[networking.ip] { facts.enc_role = '${ns_role}' and facts.region = '${facts['region']}' }"
).map |$node| { $node['networking.ip'] },
'country' => puppetdb_query(
"inventory[networking.ip] { facts.enc_role = '${ns_role}' and facts.country = '${facts['country']}' }"
).map |$node| { $node['networking.ip'] },
}
}
site/profiles/manifests/dns/master.pp
+10 -4
View File
@@ -20,9 +20,15 @@ class profiles::dns::master (
$nameservers_array = $ns_role ? {
undef => [$facts['networking']['fqdn']],
default => $use_ns ? {
'all' => sort(query_nodes("enc_role='${ns_role}'", 'networking.fqdn')),
'region' => sort(query_nodes("enc_role='${ns_role}' and region=${facts['region']}", 'networking.fqdn')),
'country' => sort(query_nodes("enc_role='${ns_role}' and country=${facts['country']}", 'networking.fqdn')),
'all' => sort(puppetdb_query(
"inventory[networking.fqdn] { facts.enc_role = '${ns_role}' }"
).map |$node| { $node['networking.fqdn'] }),
'region' => sort(puppetdb_query(
"inventory[networking.fqdn] { facts.enc_role = '${ns_role}' and facts.region = '${facts['region']}' }"
).map |$node| { $node['networking.fqdn'] }),
'country' => sort(puppetdb_query(
"inventory[networking.fqdn] { facts.enc_role = '${ns_role}' and facts.country = '${facts['country']}' }"
).map |$node| { $node['networking.fqdn'] }),
}
}
@@ -32,7 +38,7 @@ class profiles::dns::master (
$facts['networking']['fqdn'] => $facts['networking']['ip']
},
default => $nameservers_array.reduce({}) |$acc, $fqdn| {
$result = query_nodes("networking.fqdn='${fqdn}'", 'networking.ip')
$result = puppetdb_query("inventory[networking.ip] { networking.fqdn = '${fqdn}' }").map |$node| { $node['networking.ip'] }
$ip = $result[0]
$acc + { "${fqdn}." => $ip }
}