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
This commit is contained in:
Sebastiaan van Stijn 2018-10-03 23:27:28 +02:00 committed by GitHub
commit 6e5ed2ccce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -323,7 +323,8 @@ func (daemon *Daemon) initNetworkController(config *config.Config, activeSandbox
// discover and add HNS networks to windows
// network that exist are removed and added again
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
}
var n libnetwork.Network