Fix the way to set MAC.

This commit is contained in:
Tomofumi Hayashi 2018-09-05 17:16:05 +09:00 committed by dougbtv
parent 0a0c8d042a
commit ac3731380c

View File

@ -177,7 +177,7 @@ func delegateAdd(exec invoke.Exec, ifName string, delegate *types.DelegateNetCon
return nil, logging.Errorf("failed to parse mac address %q", delegate.MacRequest) return nil, logging.Errorf("failed to parse mac address %q", delegate.MacRequest)
} }
if os.Setenv("MAC", delegate.MacRequest) != nil { if os.Setenv("CNI_ARGS", fmt.Sprintf("IgnoreUnknown=true;MAC=%s", delegate.MacRequest)) != nil {
return nil, logging.Errorf("cannot set %q mac to %q: %v", delegate.Conf.Type, delegate.MacRequest, err) return nil, logging.Errorf("cannot set %q mac to %q: %v", delegate.Conf.Type, delegate.MacRequest, err)
} }
logging.Debugf("Set MAC address %q to %q", delegate.MacRequest, ifName) logging.Debugf("Set MAC address %q to %q", delegate.MacRequest, ifName)