plugins/host-local: only call LoadArgs() once

diff --git a/plugins/ipam/host-local/config.go b/plugins/ipam/host-local/config.go
index 53ab396..c33c33c 100644 (file)
--- a/plugins/ipam/host-local/config.go
+++ b/plugins/ipam/host-local/config.go
@@ -51,8 +51,8 @@ func LoadIPAMConfig(bytes []byte, args string) (*IPAMConfig, error) {
        }
 
        if args != "" {
-               ipamArgs := IPAMArgs{}
-               err := types.LoadArgs(args, &ipamArgs)
+               n.IPAM.Args = &IPAMArgs{}
+               err := types.LoadArgs(args, n.IPAM.Args)
                if err != nil {
                        return nil, err
                }

diff --git a/plugins/ipam/host-local/main.go b/plugins/ipam/host-local/main.go
index f1d7d6a..9f67e8a 100644 (file)
--- a/plugins/ipam/host-local/main.go
+++ b/plugins/ipam/host-local/main.go
@@ -37,13 +37,6 @@ func cmdAdd(args *skel.CmdArgs) error {
        }
        defer store.Close()
 
-       ipamArgs := IPAMArgs{}
-       err = types.LoadArgs(args.Args, &ipamArgs)
-       if err != nil {
-               return err
-       }
-       ipamConf.Args = &ipamArgs
-
        allocator, err := NewIPAllocator(ipamConf, store)
        if err != nil {
                return err