Skip to content
Permalink
Browse files

Merge pull request #82 from rajatchopra/master

Fix origin issue#2834; submit existing subnets as in-use
  • Loading branch information...
mrunalp committed Jun 5, 2015
2 parents 4e23d2b + 9279394 commit 9b6e4a3058a679896655527b9001f43e4f5debf6
Showing with 7 additions and 9 deletions.
  1. +7 −9 ovssubnet/common.go
@@ -90,17 +90,15 @@ func (oc *OvsController) StartMaster(sync bool, containerNetwork string, contain
}

// initialize the subnet key?
err := oc.subnetRegistry.InitSubnets()
oc.subnetRegistry.InitSubnets()
subrange := make([]string, 0)
subnets, err := oc.subnetRegistry.GetSubnets()
if err != nil {
subnets, err := oc.subnetRegistry.GetSubnets()
if err != nil {
log.Errorf("Error in initializing/fetching subnets: %v", err)
return err
}
for _, sub := range *subnets {
subrange = append(subrange, sub.Sub)
}
log.Errorf("Error in initializing/fetching subnets: %v", err)
return err
}
for _, sub := range *subnets {
subrange = append(subrange, sub.Sub)
}

err = oc.subnetRegistry.WriteNetworkConfig(containerNetwork, containerSubnetLength)

0 comments on commit 9b6e4a3

Please sign in to comment.
You can’t perform that action at this time.