From 986a3f8079a9aea15c0230b05f11796e8e8e91e4 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Sun, 9 Apr 2017 19:00:42 +0000 Subject: [PATCH] Pass bridge name into awsvpc --- ipam/tracker/awsvpc.go | 7 +++---- prog/weaver/main.go | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ipam/tracker/awsvpc.go b/ipam/tracker/awsvpc.go index 51424379..d4836953 100644 --- a/ipam/tracker/awsvpc.go +++ b/ipam/tracker/awsvpc.go @@ -30,7 +30,6 @@ import ( "github.com/vishvananda/netlink" "github.com/weaveworks/weave/common" - wnet "github.com/weaveworks/weave/net" "github.com/weaveworks/weave/net/address" ) @@ -42,7 +41,7 @@ type AWSVPCTracker struct { } // NewAWSVPCTracker creates and initialises AWS VPC based tracker. -func NewAWSVPCTracker() (*AWSVPCTracker, error) { +func NewAWSVPCTracker(bridgeName string) (*AWSVPCTracker, error) { var ( err error session = session.New() @@ -69,9 +68,9 @@ func NewAWSVPCTracker() (*AWSVPCTracker, error) { t.routeTableID = *routeTableID // Detect Weave bridge link index - link, err := netlink.LinkByName(wnet.WeaveBridgeName) + link, err := netlink.LinkByName(bridgeName) if err != nil { - return nil, fmt.Errorf("cannot find \"%s\" interface: %s", wnet.WeaveBridgeName, err) + return nil, fmt.Errorf("cannot find \"%s\" interface: %s", bridgeName, err) } t.linkIndex = link.Attrs().Index diff --git a/prog/weaver/main.go b/prog/weaver/main.go index 7982a2fb..cfd68331 100644 --- a/prog/weaver/main.go +++ b/prog/weaver/main.go @@ -337,7 +337,7 @@ func main() { var t tracker.LocalRangeTracker if isAWSVPC { Log.Infoln("Creating AWSVPC LocalRangeTracker") - t, err = tracker.NewAWSVPCTracker() + t, err = tracker.NewAWSVPCTracker(weavenet.WeaveBridgeName) if err != nil { Log.Fatalf("Cannot create AWSVPC LocalRangeTracker: %s", err) }