Merge pull request #361 from rabi/remove_check

Allow both ipv4/ipv6 provisioning interface ips

Author: openshift-merge-bot[bot]

containers/agent/provision_ip_discovery.go

@@ -118,17 +118,26 @@ func getInterfaceIP(interfaceName string) (string, bool) {
 				panic(err.Error())
 			}
 
+			var ipv4Addr, ipv6Addr string
 			for _, addr := range addrs {
 				ipObj, _, err := net.ParseCIDR(addr.String())
 				if err != nil || ipObj == nil {
 					glog.V(0).Infof("WARNING: Cannot parse IP address for interface %s: %v", interfaceName, err)
 					continue
 				}
 
-				if ipObj = ipObj.To4(); ipObj != nil {
-					return ipObj.String(), intfFound
+				if ipObj.To4() != nil {
+					ipv4Addr = ipObj.String()
+				} else {
+					ipv6Addr = ipObj.String()
 				}
-				glog.V(0).Infof("INFO: Ignoring IPv6 address (%s) on interface %s", addr, interfaceName)
+			}
+			// Prefer IPv4, but fall back to IPv6 if no IPv4 is found
+			if ipv4Addr != "" {
+				return ipv4Addr, intfFound
+			}
+			if ipv6Addr != "" {
+				return ipv6Addr, intfFound
 			}
 		}
 	}