manage network dynamic flag appropriately under various scenarios
If a network is dynamic, make sure the scope of the object doesnt change based on the cluster-mode Signed-off-by: Madhu Venugopal <madhu@docker.com>
This commit is contained in:
parent
10aec4d8f0
commit
9d01c1fcd5
1 changed files with 2 additions and 1 deletions
|
@ -320,6 +320,7 @@ func (n *network) CopyTo(o datastore.KVObject) error {
|
|||
dstN.id = n.id
|
||||
dstN.networkType = n.networkType
|
||||
dstN.scope = n.scope
|
||||
dstN.dynamic = n.dynamic
|
||||
dstN.ipamType = n.ipamType
|
||||
dstN.enableIPv6 = n.enableIPv6
|
||||
dstN.persist = n.persist
|
||||
|
@ -706,7 +707,7 @@ func (n *network) driver(load bool) (driverapi.Driver, error) {
|
|||
if cap != nil {
|
||||
n.scope = cap.DataScope
|
||||
}
|
||||
if c.isAgent() {
|
||||
if c.isAgent() || n.dynamic {
|
||||
// If we are running in agent mode then all networks
|
||||
// in libnetwork are local scope regardless of the
|
||||
// backing driver.
|
||||
|
|
Loading…
Reference in a new issue