Browse Source

Merge pull request #67 from thaJeztah/18.09_backport_windows-network-plugin-miss-fix

[18.09] Fix long startup on windows, with non-hns governed Hyper-V networks
Sebastiaan van Stijn 6 years ago
parent
commit
6e5ed2ccce
1 changed files with 2 additions and 1 deletions
  1. 2 1
      daemon/daemon_windows.go

+ 2 - 1
daemon/daemon_windows.go

@@ -323,7 +323,8 @@ func (daemon *Daemon) initNetworkController(config *config.Config, activeSandbox
 	// discover and add HNS networks to windows
 	// discover and add HNS networks to windows
 	// network that exist are removed and added again
 	// network that exist are removed and added again
 	for _, v := range hnsresponse {
 	for _, v := range hnsresponse {
-		if strings.ToLower(v.Type) == "private" {
+		networkTypeNorm := strings.ToLower(v.Type)
+		if networkTypeNorm == "private" || networkTypeNorm == "internal" {
 			continue // workaround for HNS reporting unsupported networks
 			continue // workaround for HNS reporting unsupported networks
 		}
 		}
 		var n libnetwork.Network
 		var n libnetwork.Network