@@ -416,6 +416,18 @@ func (args MasterArgs) GetServerCertHostnames() (util.StringSet, error) {

 	}

 	allHostnames := util.NewStringSet("localhost", "127.0.0.1", "openshift.default.local", "kubernetes.default.local", "kubernetes-ro.default.local", masterAddr.Host, masterPublicAddr.Host, assetPublicAddr.Host)

+

+	listenIP := net.ParseIP(args.ListenArg.ListenAddr.Host)

+	// add the IPs that might be used based on the ListenAddr.

+	if listenIP != nil && listenIP.IsUnspecified() {

+		allAddresses, _ := cmdutil.AllLocalIP4()

+		for _, ip := range allAddresses {

+			allHostnames.Insert(ip.String())

+		}

+	} else {

+		allHostnames.Insert(args.ListenArg.ListenAddr.Host)

+	}

+

 	certHostnames := util.StringSet{}

 	for hostname := range allHostnames {

 		if host, _, err := net.SplitHostPort(hostname); err == nil {

@@ -32,3 +32,30 @@ func DefaultLocalIP4() (net.IP, error) {

 	}

 	return nil, ErrorNoDefaultIP

 }

+

+// AllLocalIP4 returns all the IPv4 addresses that this host can be reached

+// on.

+func AllLocalIP4() ([]net.IP, error) {

+	devices, err := net.Interfaces()

+	if err != nil {

+		return nil, err

+	}

+

+	ret := []net.IP{}

+	for _, dev := range devices {

+		if dev.Flags&net.FlagUp != 0 {

+			addrs, err := dev.Addrs()

+			if err != nil {

+				continue

+			}

+			for i := range addrs {

+				if ip, ok := addrs[i].(*net.IPNet); ok {

+					if ip.IP.To4() != nil {

+						ret = append(ret, ip.IP)

+					}

+				}

+			}

+		}

+	}

+	return ret, nil

+}