diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-11-24 18:48:32 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-24 18:48:32 +0100 |
commit | 850bdd236ad3047695a479e1fa174267eb6f1825 (patch) | |
tree | c7107aa13094207ff73eef3abd5a428141641014 /libpod/network/create.go | |
parent | 4ebd9d9191606319f618d6e7e552256c07fff2c4 (diff) | |
parent | 9602e290de75bdd7fb5b42f6d36069dd19271735 (diff) | |
download | podman-850bdd236ad3047695a479e1fa174267eb6f1825.tar.gz podman-850bdd236ad3047695a479e1fa174267eb6f1825.tar.bz2 podman-850bdd236ad3047695a479e1fa174267eb6f1825.zip |
Merge pull request #8467 from Luap99/fix-mac-custom-net
Fix custom mac address with a custom cni network
Diffstat (limited to 'libpod/network/create.go')
-rw-r--r-- | libpod/network/create.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libpod/network/create.go b/libpod/network/create.go index 387f4fcd3..7e4fc574a 100644 --- a/libpod/network/create.go +++ b/libpod/network/create.go @@ -176,6 +176,7 @@ func createBridge(name string, options entities.NetworkCreateOptions, runtimeCon plugins = append(plugins, bridge) plugins = append(plugins, NewPortMapPlugin()) plugins = append(plugins, NewFirewallPlugin()) + plugins = append(plugins, NewTuningPlugin()) // if we find the dnsname plugin or are rootless, we add configuration for it // the rootless-cni-infra container has the dnsname plugin always installed if (HasDNSNamePlugin(runtimeConfig.Network.CNIPluginDirs) || rootless.IsRootless()) && !options.DisableDNS { |