[proxy] --with-ipam -> --no-default-ipam

proxy/create_container_interceptor.go

@@ -33,7 +33,7 @@ func (i *createContainerInterceptor) InterceptRequest(r *http.Request) error {
 		return err
 	}
 
-	if cidrs, ok := weaveCIDRsFromConfig(container.Config); ok || i.proxy.WithIPAM {
+	if cidrs, ok := weaveCIDRsFromConfig(container.Config); ok || !i.proxy.NoDefaultIPAM {
 		Info.Printf("Creating container with WEAVE_CIDR \"%s\"", strings.Join(cidrs, " "))
 		if container.HostConfig == nil {
 			container.HostConfig = &docker.HostConfig{}

proxy/create_exec_interceptor.go

@@ -29,7 +29,7 @@ func (i *createExecInterceptor) InterceptRequest(r *http.Request) error {
 		return err
 	}
 
-	if cidrs, ok := weaveCIDRsFromConfig(container.Config); ok || i.proxy.WithIPAM {
+	if cidrs, ok := weaveCIDRsFromConfig(container.Config); ok || !i.proxy.NoDefaultIPAM {
 		Info.Printf("Exec in container %s with WEAVE_CIDR \"%s\"", container.ID, strings.Join(cidrs, " "))
 		cmd := append(weaveWaitEntrypoint, "-s")
 		options.Cmd = append(cmd, options.Cmd...)

proxy/proxy.go

@@ -32,13 +32,13 @@ type Proxy struct {
 }
 
 type Config struct {
-	DockerAddr string
-	ListenAddr string
-	TLSConfig  TLSConfig
-	Version    string
-	WithDNS    bool
-	WithoutDNS bool
-	WithIPAM   bool
+	DockerAddr    string
+	ListenAddr    string
+	NoDefaultIPAM bool
+	TLSConfig     TLSConfig
+	Version       string
+	WithDNS       bool
+	WithoutDNS    bool
 }
 
 func NewProxy(c Config) (*Proxy, error) {

proxy/start_container_interceptor.go

@@ -22,7 +22,7 @@ func (i *startContainerInterceptor) InterceptResponse(r *http.Response) error {
 	}
 
 	cidrs, ok := weaveCIDRsFromConfig(container.Config)
-	if !ok && !i.proxy.WithIPAM {
+	if !ok && i.proxy.NoDefaultIPAM {
 		Debug.Print("No Weave CIDR, ignoring")
 		return nil
 	}