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

This commit is contained in:
Paul Bellamy committed 2015-06-17 11:31:33 +01:00
1 parent cf5d8874b6
commit 220c80c3ed
10 files changed
+56 -46

No files matched your search

+1 -1
View File
@@ -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...)