remove ipam.DummyAllocator and rely on new SurrogateGossiper

As a result it is possible to mix nodes with and without IPAM. Note
that the quorum only involves the former, and hence such mixed
environments will typically require a custom `-initpeercount`.

ipam/dummy.go

@@ -1,32 +0,0 @@
-package ipam
-
-import (
-	"errors"
-
-	"github.com/weaveworks/weave/router"
-)
-
-// Exists solely for the purpose of detecting a network in which some
-// peers are configured with IPAM on and some with IPAM off.
-type DummyAllocator struct {
-}
-
-var (
-	ErrMixedConfig = errors.New("Mixed IPAM/non-IPAM configuration not supported")
-)
-
-func (alloc *DummyAllocator) OnGossipUnicast(sender router.PeerName, msg []byte) error {
-	return ErrMixedConfig
-}
-
-func (alloc *DummyAllocator) OnGossipBroadcast(msg []byte) (router.GossipData, error) {
-	return nil, ErrMixedConfig
-}
-
-func (alloc *DummyAllocator) OnGossip(msg []byte) (router.GossipData, error) {
-	return nil, ErrMixedConfig
-}
-
-func (alloc *DummyAllocator) Gossip() router.GossipData {
-	return nil
-}

prog/weaver/main.go

@@ -153,8 +153,6 @@ func main() {
 		}
 	} else if peerCount > 0 {
 		log.Fatal("-initpeercount flag specified without -iprange")
-	} else {
-		router.NewGossip("IPallocation", &ipam.DummyAllocator{})
 	}
 
 	router.Start()