1
0
mirror of https://github.com/rancher/os.git synced 2025-09-02 15:24:32 +00:00

Get rid of docker-sys bridge setting by CNI

This commit is contained in:
niusmallnan
2018-05-11 15:10:15 +08:00
parent 9fd78909f3
commit 3669df9599
3 changed files with 0 additions and 36 deletions

View File

@@ -14,7 +14,6 @@ import (
"github.com/docker/docker/pkg/mount"
"github.com/rancher/os/config"
"github.com/rancher/os/config/cmdline"
"github.com/rancher/os/dfs"
"github.com/rancher/os/log"
"github.com/rancher/os/util"
@@ -438,12 +437,6 @@ func RunInit() error {
log.FsReady()
log.Debugf("WARNING: switchroot and mount OEM2 phases not written to log file")
// update docker-sys bridge setting
if dockerSysSubnet := cmdline.GetCmdline(config.RKPDockerSysBridgeSubnet); dockerSysSubnet != "" {
val := dockerSysSubnet.(string)
config.SaveCNISubnet(val, config.CNIBridgeConfigFile)
}
return cfg, nil
}},
config.CfgFuncData{"b2d Env", func(cfg *config.CloudConfig) (*config.CloudConfig, error) {