From a9bbe5046abe2e281e68411a103915f14f08b5e1 Mon Sep 17 00:00:00 2001 From: janeczku Date: Wed, 3 Jan 2018 01:39:56 +0100 Subject: [PATCH] Fixed regression: User-configured datasources ignored in cloud-init-save Bug introduced in https://github.com/rancher/os/commit/51aff79c7e04d4ed1d81ceb71a17263d5c7c8eab#diff-add8541b8b3d498a5afdf604303ea0d4 Signed-off-by: janeczku --- init/init.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/init/init.go b/init/init.go index 4ebb8b9f..6c645ef8 100755 --- a/init/init.go +++ b/init/init.go @@ -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)