Check if IPv6 is enabled before restoring the network pools

Signed-off-by: Alessandro Boch <aboch@docker.com>
moby · Sep 15, 2016 · 214f592 · 214f592
1 parent c1f6d91
commit 214f592
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/controller.go b/controller.go
@@ -753,9 +753,11 @@ func (c *controller) reservePools() {
 				c.Gateway = n.ipamV4Info[i].Gateway.IP.String()
 			}
 		}
-		for i, c := range n.ipamV6Config {
-			if c.Gateway == "" && n.ipamV6Info[i].Gateway != nil {
-				c.Gateway = n.ipamV6Info[i].Gateway.IP.String()
+		if n.enableIPv6 {
+			for i, c := range n.ipamV6Config {
+				if c.Gateway == "" && n.ipamV6Info[i].Gateway != nil {
+					c.Gateway = n.ipamV6Info[i].Gateway.IP.String()
+				}
 			}
 		}
 		// Reserve pools