rtyler
/
libnetwork
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Merge pull request #1764 from aboch/isadyn 

Restore isAgent || n.dynamic check
This commit is contained in:
Madhu Venugopal 2017-05-18 13:12:29 -07:00 committed by GitHub
parent 4ce9ec632f caffa143bf
commit 1f7a1f11bb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
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