Merge pull request #412 from akutz/bugfix/rbd-parse-ips

Fix for Ceph MonIPs with Ports
thecodeteam · Feb 11, 2017 · e43c941 · e43c941
2 parents ad5dbe0 + 1040f4c
commit e43c941
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/drivers/storage/rbd/executor/rbd_executor.go b/drivers/storage/rbd/executor/rbd_executor.go
@@ -160,17 +160,19 @@ func getCephMonIPs() ([]net.IP, error) {
 
 	monStrings := strings.Split(strings.TrimSpace(string(out)), ",")
 
-	monIps := make([]net.IP, 0, 4)
+	monIps := []net.IP{}
 
 	for _, mon := range monStrings {
-		ip := net.ParseIP(mon)
-		if ip != nil {
-			monIps = append(monIps, ip)
-		} else {
-			ipSlice, err := net.LookupIP(mon)
-			if err == nil {
-				monIps = append(monIps, ipSlice...)
-			}
+		host, _, err := net.SplitHostPort(mon)
+		if err != nil {
+			return nil, err
+		}
+		addrs, err := net.LookupIP(host)
+		if err != nil {
+			return nil, err
+		}
+		if len(addrs) > 0 {
+			monIps = append(monIps, addrs...)
 		}
 	}