Extract FindBridgeIP to net package

This commit is contained in:
Bryan Boreham committed 2016-12-23 11:57:04 +00:00
1 parent c03a2caac2
commit 6ef302b8a1
3 files changed
+26 -26

No files matched your search

+2 -5
View File
@@ -148,14 +148,11 @@ func NewProxy(c Config) (*Proxy, error) {
p.client = client.Client
if !p.WithoutDNS {
netDev, err := weavenet.GetBridgeNetDev(c.DockerBridge)
ip, err := weavenet.FindBridgeIP(c.DockerBridge, nil)
if err != nil {
return nil, err
}
if len(netDev.CIDRs) < 1 {
return nil, fmt.Errorf("Could not obtain address of %s", c.DockerBridge)
}
p.dockerBridgeIP = netDev.CIDRs[0].IP.String()
p.dockerBridgeIP = ip.String()
Log.Infof("Using docker bridge IP for DNS: %v", p.dockerBridgeIP)
}