Explorar o código

Merge pull request #2419 from lemrouch/2418-fix

Fix internal macvlan network to work in swarm
Arko Dasgupta %!s(int64=5) %!d(string=hai) anos
pai
achega
cedfa2f7b9

+ 0 - 3
libnetwork/drivers/ipvlan/ipvlan_network.go

@@ -194,12 +194,9 @@ func parseNetworkOptions(id string, option options.Generic) (*configuration, err
 			return nil, err
 		}
 	}
-	// setting the parent to "" will trigger an isolated network dummy parent link
 	if val, ok := option[netlabel.Internal]; ok {
 		if internal, ok := val.(bool); ok && internal {
 			config.Internal = true
-			// empty --parent= and --internal are handled the same.
-			config.Parent = ""
 		}
 	}
 	return config, nil

+ 0 - 3
libnetwork/drivers/macvlan/macvlan_network.go

@@ -198,12 +198,9 @@ func parseNetworkOptions(id string, option options.Generic) (*configuration, err
 			return nil, err
 		}
 	}
-	// setting the parent to "" will trigger an isolated network dummy parent link
 	if val, ok := option[netlabel.Internal]; ok {
 		if internal, ok := val.(bool); ok && internal {
 			config.Internal = true
-			// empty --parent= and --internal are handled the same.
-			config.Parent = ""
 		}
 	}