Skip to content

Commit

Permalink
Allow network with --config-from to be --internal
Browse files Browse the repository at this point in the history
The --internal netlabel is discarded now.

Signed-off-by: Pavel Matěja <[email protected]>
  • Loading branch information
lemrouch committed Jun 28, 2019
1 parent b5e7180 commit 9bcd91d
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -798,9 +798,11 @@ func (c *controller) NewNetwork(networkType, name string, id string, options ...
if err != nil {
return nil, types.NotFoundErrorf("configuration network %q does not exist", network.configFrom)
}
internal := network.internal
if err = t.applyConfigurationTo(network); err != nil {
return nil, types.InternalErrorf("Failed to apply configuration: %v", err)
}
network.generic[netlabel.Internal] = internal
defer func() {
if err == nil {
if err := t.getEpCnt().IncEndpointCnt(); err != nil {
Expand Down

0 comments on commit 9bcd91d

Please sign in to comment.