Proxy support for IPAM

Pass `-e WEAVE_CIDR=` to your container to use IPAM. If IPAM is not
enabled on the weave router, the container will be booted without weave
networking.

I'm not crazy about adding *another* undocumented weave cli command
(ipam-cidr), but it saves the proxy messing around finding container
IPs.
This commit is contained in:
Paul Bellamy committed 2015-05-21 15:37:37 +01:00
1 parent 22b8f482ea
commit 46bdd8c67d
5 files changed
+37 -2

No files matched your search

+1 -2
View File
@@ -31,8 +31,7 @@ func callWeave(args ...string) ([]byte, error) {
func weaveCIDRsFromConfig(config *docker.Config) ([]string, bool) {
for _, e := range config.Env {
if strings.HasPrefix(e, "WEAVE_CIDR=") {
result := strings.Trim(e[11:], " ")
return strings.Split(strings.TrimSpace(result), " "), result != ""
return strings.Fields(e[11:]), true
}
}
return nil, false
+8
View File
@@ -28,6 +28,14 @@ func (i *startContainerInterceptor) InterceptResponse(r *http.Response) error {
Debug.Print("No Weave CIDR, ignoring")
return nil
}
if len(cidrs) == 0 {
ipamCIDR, err := callWeave("ipam-cidr", container.ID)
if err != nil {
Warning.Printf("Determining container %s IP via IPAM failed: %v, %v", container.ID, err, string(ipamCIDR))
return nil
}
cidrs = strings.Fields(string(ipamCIDR))
}
Info.Printf("Attaching container %s with WEAVE_CIDR \"%s\" to weave network", container.ID, strings.Join(cidrs, " "))
args := []string{"attach"}
args = append(args, cidrs...)