[proxy] refactor weaveCIDRsFromConfig slightly

This commit is contained in:
Paul Bellamy committed 2015-06-17 14:51:12 +01:00
1 parent ca681bce13
commit 6c26a55b5a
5 files changed
+16 -16

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, i.proxy.NoDefaultIPAM); ok {
if cidrs, ok := i.proxy.weaveCIDRsFromConfig(container.Config); ok {
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...)