Merge pull request #995 from aboch/vcu

mavenugo · mavenugo · commit 559414520b63 · 2016-03-07T17:21:50.000-08:00
Fix veth leak in overlay driver
diff --git a/drivers/overlay/joinleave.go b/drivers/overlay/joinleave.go
@@ -54,7 +54,7 @@ func (d *driver) Join(nid, eid string, sboxKey string, jinfo driverapi.JoinInfo,
 		return err
 	}
 
-	ep.ifName = overlayIfName
+	ep.ifName = containerIfName
 
 	// Set the container interface and its peer MTU to 1450 to allow
 	// for 50 bytes vxlan encap (inner eth header(14) + outer IP(20) +

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ func (d *driver) Join(nid, eid string, sboxKey string, jinfo driverapi.JoinInfo,`
`54`	`54`	`return err`
`55`	`55`	`}`
`56`	`56`
`57`		`- ep.ifName = overlayIfName`
	`57`	`+ ep.ifName = containerIfName`
`58`	`58`
`59`	`59`	`// Set the container interface and its peer MTU to 1450 to allow`
`60`	`60`	`// for 50 bytes vxlan encap (inner eth header(14) + outer IP(20) +`