From a550d48f21ec4a079db0c5a0acb71bf302ad8c9c Mon Sep 17 00:00:00 2001
From: Ben Vincent <ben@unkin.net>
Date: Sun, 6 Jul 2025 20:09:19 +1000
Subject: [PATCH] fix: sort nameservers (#348)

- sort nameservers before creating glue records

Reviewed-on: https://git.unkin.net/unkin/puppet-prod/pulls/348
---
 site/profiles/manifests/dns/master.pp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/site/profiles/manifests/dns/master.pp b/site/profiles/manifests/dns/master.pp
index 55b2946..73c23b6 100644
--- a/site/profiles/manifests/dns/master.pp
+++ b/site/profiles/manifests/dns/master.pp
@@ -20,9 +20,9 @@ class profiles::dns::master (
   $nameservers_array = $ns_role ? {
     undef   => [$facts['networking']['fqdn']],
     default => $use_ns ? {
-      'all'     => query_nodes("enc_role='${ns_role}'", 'networking.fqdn'),
-      'region'  => query_nodes("enc_role='${ns_role}' and region=${facts['region']}", 'networking.fqdn'),
-      'country' => query_nodes("enc_role='${ns_role}' and country=${facts['country']}", 'networking.fqdn'),
+      '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')),
     }
   }
 
@@ -75,7 +75,7 @@ class profiles::dns::master (
       profiles::dns::zone { $name:
         zone         => $data['domain'],
         basedir      => $basedir,
-        nameservers  => sort($nameservers),
+        nameservers  => $nameservers,
         owner        => $owner,
         group        => $group,
         before       => Bind::Zone[$name],