rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-04-28 03:20:50 +00:00
Code Issues Releases Wiki Activity

Optimized the process of static ip

Browse Source
This commit is contained in:
Jason-ZW 2018-10-18 11:09:58 +08:00 committed by niusmallnan
parent 408f7afd63
commit 5f4ff44780
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/init/cloudinit/cloudinit.go
View File

@ -10,7 +10,16 @@ import (
)
func CloudInit(cfg *config.CloudConfig) (*config.CloudConfig, error) {
cfg.Rancher.CloudInit.Datasources = config.LoadConfigWithPrefix(config.StateDir).Rancher.CloudInit.Datasources
stateConfig := config.LoadConfigWithPrefix(config.StateDir)
cfg.Rancher.CloudInit.Datasources = stateConfig.Rancher.CloudInit.Datasources
if len(stateConfig.Rancher.Network.Interfaces) > 0 {
cfg.Rancher.Network = stateConfig.Rancher.Network
if err := config.Set("rancher.network", stateConfig.Rancher.Network); err != nil {
log.Error(err)
}
}
hypervisor := util.GetHypervisor()
if hypervisor == "" {
log.Infof("ros init: No Detected Hypervisor")