Skip to content
This repository has been archived by the owner on Jul 16, 2024. It is now read-only.

openstack: try to consistently return addresses from the first network #393

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion etcd-manager/pkg/volumes/openstack/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package openstack
import (
"fmt"
"net"
"sort"
)

const (
Expand All @@ -28,7 +29,15 @@ const (
)

func GetServerFixedIP(addrs map[string]interface{}, name string, networkCIDR *net.IPNet) (poolAddress string, err error) {
for _, address := range addrs {
// Introduce some determinism, even though map ordering is random
var addressKeys []string
for addressKey := range addrs {
addressKeys = append(addressKeys, addressKey)
}
sort.Strings(addressKeys)

for _, addressKey := range addressKeys {
address := addrs[addressKey]
if addresses, ok := address.([]interface{}); ok {
for _, addr := range addresses {
addrMap := addr.(map[string]interface{})
Expand Down
Loading