rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-07-05 11:06:13 +00:00
Code Issues Releases Wiki Activity

Fixed regression: User-configured datasources ignored in cloud-init-save

Browse Source 
Bug introduced in 51aff79c7e (diff-add8541b8b3d498a5afdf604303ea0d4)

Signed-off-by: janeczku <jan@rancher.com>
This commit is contained in:
janeczku 2018-01-03 01:39:56 +01:00 committed by niusmallnan
parent 5494e76041
commit a9bbe5046a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
init/init.go
View File

@ -334,9 +334,10 @@ func RunInit() error {
if hypervisor == "vmware" {
// add vmware to the end - we don't want to over-ride an choices the user has made
cfg.Rancher.CloudInit.Datasources = append(cfg.Rancher.CloudInit.Datasources, hypervisor)
if err := config.Set("rancher.cloud_init.datasources", cfg.Rancher.CloudInit.Datasources); err != nil {
log.Error(err)
}
}
if err := config.Set("rancher.cloud_init.datasources", cfg.Rancher.CloudInit.Datasources); err != nil {
log.Error(err)
}
log.Infof("init, runCloudInitServices(%v)", cfg.Rancher.CloudInit.Datasources)