kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #1318 from mavenugo/nscope 

manage network dynamic flag appropriately under various scenarios
This commit is contained in:
Alessandro Boch 2016-07-12 10:00:20 -07:00 committed by GitHub
parent 918c6052ae 9d01c1fcd5
commit e4957174ee
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libnetwork/network.go
View File

@ -320,6 +320,7 @@ func (n *network) CopyTo(o datastore.KVObject) error {
dstN.id = n.id dstN.id = n.id
dstN.networkType = n.networkType dstN.networkType = n.networkType
dstN.scope = n.scope dstN.scope = n.scope
dstN.dynamic = n.dynamic
dstN.ipamType = n.ipamType dstN.ipamType = n.ipamType
dstN.enableIPv6 = n.enableIPv6 dstN.enableIPv6 = n.enableIPv6
dstN.persist = n.persist dstN.persist = n.persist
@ -706,7 +707,7 @@ func (n *network) driver(load bool) (driverapi.Driver, error) {
if cap != nil { if cap != nil {
n.scope = cap.DataScope n.scope = cap.DataScope
} }
if c.isAgent() { if c.isAgent() || n.dynamic {
// If we are running in agent mode then all networks // If we are running in agent mode then all networks
// in libnetwork are local scope regardless of the // in libnetwork are local scope regardless of the
// backing driver. // backing driver.