Merge pull request #103 from alice02/fix/skip_settleaddress

pkg/ipam: Skip ip.SettleAddresses if only IPv4 is used
2018-01-22 12:07:41 +01:00
parent 6aa21c431e 97664d8a6a
commit d228f980e1
1 changed files with 3 additions and 1 deletions
--- a/pkg/ipam/ipam_linux.go
+++ b/pkg/ipam/ipam_linux.go
@ -65,7 +65,9 @@ func ConfigureIface(ifName string, res *current.Result) error {
 		}
 	}

-	ip.SettleAddresses(ifName, 10)
+	if v6gw != nil {
+		ip.SettleAddresses(ifName, 10)
+	}

 	for _, r := range res.Routes {
 		routeIsV4 := r.Dst.IP.To4() != nil