Ensure stable ordering/consistency of pools.yaml contents

rndc keys and predictable ips need to match by index as they are "per
bind". This patch removes sorting on IPs etc which will interfere with
this association.

Author: beagles

pkg/designate/generate_bind9_pools_yaml.go

@@ -89,36 +89,34 @@ func GeneratePoolsYamlDataAndHash(BindMap, MdnsMap, NsRecordsMap map[string]stri
 		return nsRecords[i].Priority < nsRecords[j].Priority
 	})
 
-	bindIPs := make([]string, 0, len(BindMap))
-	for _, ip := range BindMap {
-		bindIPs = append(bindIPs, ip)
+	bindIPs := make([]string, len(BindMap))
+	key_tmpl := "bind_address_%d"
+	for i := 0; i < len(BindMap); i++ {
+		bindIPs[i] = BindMap[fmt.Sprintf(key_tmpl, i)]
 	}
-	sort.Strings(bindIPs)
 
 	masterHosts := make([]string, 0, len(MdnsMap))
 	for _, host := range MdnsMap {
 		masterHosts = append(masterHosts, host)
 	}
 	sort.Strings(masterHosts)
 
-	nameservers := make([]Nameserver, len(bindIPs))
-	for i, bindIP := range bindIPs {
-		nameservers[i] = Nameserver{
-			Host: bindIP,
-			Port: 53,
-		}
-	}
-
 	targets := make([]Target, len(bindIPs))
-	for i, bindIP := range bindIPs {
+	nameservers := make([]Nameserver, len(bindIPs))
+	for i := 0; i < len(bindIPs); i++ {
 		masters := make([]Master, len(masterHosts))
 		for j, masterHost := range masterHosts {
 			masters[j] = Master{
 				Host: masterHost,
 				Port: 5354,
 			}
 		}
+		bindIP := bindIPs[i]
 
+		nameservers[i] = Nameserver{
+			Host: bindIP,
+			Port: 53,
+		}
 		targets[i] = Target{
 			Type:        "bind9",
 			Description: fmt.Sprintf("BIND9 Server %d (%s)", i, bindIP),
@@ -133,15 +131,6 @@ func GeneratePoolsYamlDataAndHash(BindMap, MdnsMap, NsRecordsMap map[string]stri
 		}
 	}
 
-	sort.Slice(targets, func(i, j int) bool {
-		return targets[i].Options.Host < targets[j].Options.Host
-	})
-
-	for i := range targets {
-		targets[i].Description = fmt.Sprintf("BIND9 Server %d (%s)", i, targets[i].Options.Host)
-		targets[i].Options.RNDCKeyFile = fmt.Sprintf("%s/%s-%d", RndcConfDir, DesignateRndcKey, i)
-	}
-
 	// Catalog zone is an optional section
 	// catalogZone := &CatalogZone{
 	// 	FQDN:    "example.org.",