0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Restore isAgent || n.dynamic check

Browse source 
- This got mistakenly changed by 254d082cc3

Signed-off-by: Alessandro Boch <aboch@docker.com>
This commit is contained in:
Alessandro Boch 2017-05-18 12:19:16 -07:00
parent 86abd1ea41
commit 08d8cfa00f
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libnetwork/network.go
View file

@ -911,8 +911,8 @@ func (n *network) driver(load bool) (driverapi.Driver, error) {
if n.scope == "" && cap != nil {
n.scope = cap.DataScope
}
if isAgent && n.dynamic {
// If we are running in agent mode and the network
if isAgent || n.dynamic {
// If we are running in agent mode or the network
// is dynamic, then the networks are swarm scoped
// regardless of the backing driver.
n.scope = datastore.SwarmScope