From d36d4555aa8f09700b8a4672974ae49a41b04e09 Mon Sep 17 00:00:00 2001
From: Sven Dowideit <SvenDowideit@home.org.au>
Date: Tue, 18 Jul 2017 21:52:28 +1000
Subject: [PATCH] Add a little logging to make debugging datasources a little
 easier

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
---
 cmd/cloudinitsave/cloudinitsave.go            |  7 +++---
 .../datasource/vmware/vmware_test.go          |  3 +++
 init/init.go                                  | 23 ++++++++++---------
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/cmd/cloudinitsave/cloudinitsave.go b/cmd/cloudinitsave/cloudinitsave.go
index 5834ce53..2eded670 100755
--- a/cmd/cloudinitsave/cloudinitsave.go
+++ b/cmd/cloudinitsave/cloudinitsave.go
@@ -66,20 +66,21 @@ func Main() {
 }
 
 func saveCloudConfig() error {
-	log.Debugf("SaveCloudConfig")
+	log.Infof("SaveCloudConfig")
 
 	cfg := rancherConfig.LoadConfig()
 	log.Debugf("init: SaveCloudConfig(pre ApplyNetworkConfig): %#v", cfg.Rancher.Network)
 	network.ApplyNetworkConfig(cfg)
 
-	log.Debugf("datasources that will be consided: %#v", cfg.Rancher.CloudInit.Datasources)
+	log.Infof("datasources that will be consided: %#v", cfg.Rancher.CloudInit.Datasources)
 	dss := getDatasources(cfg.Rancher.CloudInit.Datasources)
 	if len(dss) == 0 {
 		log.Errorf("currentDatasource - none found")
 		return nil
 	}
 
-	selectDatasource(dss)
+	foundDs := selectDatasource(dss)
+	log.Infof("Cloud-init datasource that was used: %s", foundDs)
 
 	// Apply any newly detected network config.
 	cfg = rancherConfig.LoadConfig()
diff --git a/config/cloudinit/datasource/vmware/vmware_test.go b/config/cloudinit/datasource/vmware/vmware_test.go
index d45b9afb..50e714fa 100644
--- a/config/cloudinit/datasource/vmware/vmware_test.go
+++ b/config/cloudinit/datasource/vmware/vmware_test.go
@@ -356,6 +356,9 @@ func TestOvfTransport(t *testing.T) {
 
 		file.WriteString(tt.document)
 		v := NewDatasource(file.Name())
+		if v == nil {
+			continue
+		}
 		v.urlDownload = fakeDownloader
 
 		metadata, err := v.FetchMetadata()
diff --git a/init/init.go b/init/init.go
index bde14389..790257d8 100755
--- a/init/init.go
+++ b/init/init.go
@@ -217,6 +217,15 @@ func setupSharedRoot(c *config.CloudConfig) (*config.CloudConfig, error) {
 	return c, mount.MakeShared("/")
 }
 
+func PrintConfig() {
+	cfgString, err := config.Export(false, true)
+	if err != nil {
+		log.WithFields(log.Fields{"err": err}).Error("Error serializing config")
+	} else {
+		log.Debugf("Config: %s", cfgString)
+	}
+}
+
 func RunInit() error {
 	os.Setenv("PATH", "/sbin:/usr/sbin:/usr/bin")
 	if isInitrd() {
@@ -254,17 +263,9 @@ func RunInit() error {
 		}},
 		config.CfgFuncData{"mount OEM", mountOem},
 		config.CfgFuncData{"debug save cfg", func(_ *config.CloudConfig) (*config.CloudConfig, error) {
+			PrintConfig()
+
 			cfg := config.LoadConfig()
-
-			if cfg.Rancher.Debug {
-				cfgString, err := config.Export(false, true)
-				if err != nil {
-					log.WithFields(log.Fields{"err": err}).Error("Error serializing config")
-				} else {
-					log.Debugf("Config: %s", cfgString)
-				}
-			}
-
 			return cfg, nil
 		}},
 		config.CfgFuncData{"load modules", loadModules},
@@ -334,7 +335,7 @@ func RunInit() error {
 				}
 			}
 
-			log.Debug("init, runCloudInitServices()")
+			log.Infof("init, runCloudInitServices(%v)", cfg.Rancher.CloudInit.Datasources)
 			if err := runCloudInitServices(cfg); err != nil {
 				log.Error(err)
 			}