containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1939 from mheon/no_firewall_if_rootless 

Don't initialize CNI when running as rootless
This commit is contained in:
OpenShift Merge Robot 2018-12-04 12:55:40 -08:00 committed by GitHub
parent b81f640bb5 32aa45e344
commit aba52cf588
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libpod/runtime.go
View File

@ -521,11 +521,13 @@ func makeRuntime(runtime *Runtime) (err error) {
}
// Set up the CNI net plugin
netPlugin, err := ocicni.InitCNI(runtime.config.CNIDefaultNetwork, runtime.config.CNIConfigDir, runtime.config.CNIPluginDir...)
if err != nil {
return errors.Wrapf(err, "error configuring CNI network plugin")
if !rootless.IsRootless() {
netPlugin, err := ocicni.InitCNI(runtime.config.CNIDefaultNetwork, runtime.config.CNIConfigDir, runtime.config.CNIPluginDir...)
if err != nil {
return errors.Wrapf(err, "error configuring CNI network plugin")
}
runtime.netPlugin = netPlugin
}
runtime.netPlugin = netPlugin
// Set up a firewall backend
backendType := ""