Merge pull request #1985 from weaveworks/issues/1984-discovery

Add two functions required by ipamapi "contract"

Fixes #1984
This commit is contained in:
Matthias Radestock committed 2016-02-18 21:55:53 +00:00
commit 5e761a62b0
1 file changed
+11
+11
View File
@@ -4,6 +4,7 @@ import (
"fmt"
"net"
"github.com/docker/libnetwork/discoverapi"
"github.com/docker/libnetwork/ipamapi"
"github.com/docker/libnetwork/netlabel"
godocker "github.com/fsouza/go-dockerclient"
@@ -67,3 +68,13 @@ func (i *ipam) ReleaseAddress(poolID string, address net.IP) error {
Log.Debugln("ReleaseAddress", poolID, address)
return i.weave.ReleaseIP(address.String())
}
// Functions required by ipamapi "contract" but not actually used.
func (i *ipam) DiscoverNew(discoverapi.DiscoveryType, interface{}) error {
return nil
}
func (i *ipam) DiscoverDelete(discoverapi.DiscoveryType, interface{}) error {
return nil
}