Merge branch 'ipv6' into v1.4.0-rc

projectcalico · Aug 29, 2016 · f23652d · f23652d
2 parents 4341725 + 44581fe
commit f23652d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 94 deletions.
diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -1,6 +1,9 @@
 package: github.com/projectcalico/calico-cni
 import:
 - package: github.com/containernetworking/cni
+  version: SetupVeth
+  repo: [email protected]:tomdee/cni.git
+  vcs: git
   subpackages:
   - pkg/ip
   - pkg/ipam

diff --git a/utils/network.go b/utils/network.go
@@ -83,7 +83,7 @@ func setupContainerNetworking(netns, ifName string, mtu int, res *types.Result)
 
 			_, defNet, _ := net.ParseCIDR("::/0")
 			if err = ip.AddRoute(defNet, hostIPv6Addr, contVeth); err != nil {
-				return fmt.Errorf("failed to add route %v", err)
+				return fmt.Errorf("failed to add default gateway to %v %v", hostIPv6Addr, err)
 			}
 
 			if err = netlink.AddrAdd(contVeth, &netlink.Addr{IPNet: &res.IP6.IP}); err != nil {