From 791fc9d6b1ec7ae36ba8ccab3b7fc24093b4e131 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Fri, 4 Dec 2015 17:49:09 +0000 Subject: [PATCH] Return fake 'gateway address' to avoid requiring consensus during initialization --- plugin/ipam/driver.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plugin/ipam/driver.go b/plugin/ipam/driver.go index 1fbdf91b..766aa9a1 100644 --- a/plugin/ipam/driver.go +++ b/plugin/ipam/driver.go @@ -4,6 +4,7 @@ import ( "net" "github.com/docker/libnetwork/ipamapi" + "github.com/docker/libnetwork/netlabel" "github.com/weaveworks/weave/api" . "github.com/weaveworks/weave/common" "github.com/weaveworks/weave/common/docker" @@ -32,7 +33,10 @@ func (i *ipam) RequestPool(addressSpace, pool, subPool string, options map[strin Log.Debugln("RequestPool", addressSpace, pool, subPool, options) cidr, err := i.weave.DefaultSubnet() Log.Debugln("RequestPool returning ", cidr, err) - return "weavepool", cidr, nil, err + // Pass back a fake "gateway address"; we don't actually use it, + // so just give the network address. + data := map[string]string{netlabel.Gateway: cidr.String()} + return "weavepool", cidr, data, err } func (i *ipam) ReleasePool(poolID string) error {