rancher/plugins
1
0
Fork 1
mirror of https://github.com/rancher/plugins.git synced 2025-08-31 12:38:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #205 from steveeJ/teardown-fix

Browse Source 
plugins/{ptp,bridge}: teardown first
This commit is contained in:
Jonathan Boulle
2016-05-12 10:54:47 +02:00
parent 64791dd233 d91971cbe0
commit 463e171614
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/main/bridge/bridge.go
View File

@@ -238,6 +238,10 @@ func cmdDel(args *skel.CmdArgs) error {
return err
}
if err := ipam.ExecDel(n.IPAM.Type, args.StdinData); err != nil {
return err
}
var ipn *net.IPNet
err = ns.WithNetNSPath(args.Netns, false, func(hostNS *os.File) error {
var err error
@@ -256,7 +260,7 @@ func cmdDel(args *skel.CmdArgs) error {
}
}
return ipam.ExecDel(n.IPAM.Type, args.StdinData)
return nil
}
func main() {

6
plugins/main/ptp/ptp.go
View File

@@ -195,6 +195,10 @@ func cmdDel(args *skel.CmdArgs) error {
return fmt.Errorf("failed to load netconf: %v", err)
}
if err := ipam.ExecDel(conf.IPAM.Type, args.StdinData); err != nil {
return err
}
var ipn *net.IPNet
err := ns.WithNetNSPath(args.Netns, false, func(hostNS *os.File) error {
var err error
@@ -213,7 +217,7 @@ func cmdDel(args *skel.CmdArgs) error {
}
}
return ipam.ExecDel(conf.IPAM.Type, args.StdinData)
return nil
}
func main() {