From 51aff79c7e04d4ed1d81ceb71a17263d5c7c8eab Mon Sep 17 00:00:00 2001
From: Sven Dowideit <SvenDowideit@home.org.au>
Date: Sat, 17 Jun 2017 22:56:25 +1000
Subject: [PATCH] Add proper vmware cloud-init datasource from guestinfo

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
---
 cmd/cloudinitsave/cloudinitsave.go            |  5 +++-
 config/cloudinit/datasource/vmware/vmware.go  |  6 ++---
 docs/os/running-rancheros/server/pxe/index.md | 25 ++++++++++---------
 init/init.go                                  | 12 +++++----
 4 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/cmd/cloudinitsave/cloudinitsave.go b/cmd/cloudinitsave/cloudinitsave.go
index 327e2a36..80df80b2 100755
--- a/cmd/cloudinitsave/cloudinitsave.go
+++ b/cmd/cloudinitsave/cloudinitsave.go
@@ -39,6 +39,7 @@ import (
 	"github.com/rancher/os/config/cloudinit/datasource/metadata/packet"
 	"github.com/rancher/os/config/cloudinit/datasource/proccmdline"
 	"github.com/rancher/os/config/cloudinit/datasource/url"
+	"github.com/rancher/os/config/cloudinit/datasource/vmware"
 	"github.com/rancher/os/config/cloudinit/pkg"
 	"github.com/rancher/os/log"
 	"github.com/rancher/os/netconf"
@@ -229,7 +230,7 @@ func getDatasources(datasources []string) []datasource.Datasource {
 
 		switch parts[0] {
 		case "*":
-			dss = append(dss, getDatasources([]string{"configdrive", "ec2", "digitalocean", "packet", "gce"})...)
+			dss = append(dss, getDatasources([]string{"configdrive", "vmware", "ec2", "digitalocean", "packet", "gce"})...)
 		case "ec2":
 			dss = append(dss, ec2.NewDatasource(root))
 		case "file":
@@ -256,6 +257,8 @@ func getDatasources(datasources []string) []datasource.Datasource {
 			dss = append(dss, gce.NewDatasource(root))
 		case "packet":
 			dss = append(dss, packet.NewDatasource(root))
+		case "vmware":
+			dss = append(dss, vmware.NewDatasource(root))
 		}
 	}
 
diff --git a/config/cloudinit/datasource/vmware/vmware.go b/config/cloudinit/datasource/vmware/vmware.go
index c68fe389..7f198c3a 100755
--- a/config/cloudinit/datasource/vmware/vmware.go
+++ b/config/cloudinit/datasource/vmware/vmware.go
@@ -131,19 +131,19 @@ func (v VMWare) FetchMetadata() (metadata datasource.Metadata, err error) {
 }
 
 func (v VMWare) FetchUserdata() ([]byte, error) {
-	encoding, err := v.readConfig("coreos.config.data.encoding")
+	encoding, err := v.readConfig("cloud-init.data.encoding")
 	if err != nil {
 		return nil, err
 	}
 
-	data, err := v.readConfig("coreos.config.data")
+	data, err := v.readConfig("cloud-init.config.data")
 	if err != nil {
 		return nil, err
 	}
 
 	// Try to fallback to url if no explicit data
 	if data == "" {
-		url, err := v.readConfig("coreos.config.url")
+		url, err := v.readConfig("cloud-init.config.url")
 		if err != nil {
 			return nil, err
 		}
diff --git a/docs/os/running-rancheros/server/pxe/index.md b/docs/os/running-rancheros/server/pxe/index.md
index 12d83c1f..67a2acef 100644
--- a/docs/os/running-rancheros/server/pxe/index.md
+++ b/docs/os/running-rancheros/server/pxe/index.md
@@ -50,19 +50,20 @@ When this service is run, the `EXTRA_CMDLINE` will be set.
 
 Valid cloud-init datasources for RancherOS.
 
-| type | default |
+| type | default |  |
 |---|---|--|
-| ec2 | ec2's DefaultAddress |
-| file | path |
-| cmdline | /media/config-2 |
-| configdrive |  |
-| digitalocean | DefaultAddress |
-| ec2 | DefaultAddress |
-| file | path |
-| gce |  |
-| packet | DefaultAddress |
-| url | url |
-| * | This will add ["configdrive", "ec2", "digitalocean", "packet", "gce"] into the list of datasources to try |
+| ec2 | ec2's DefaultAddress |  |
+| file | path |  |
+| cmdline | /media/config-2 |  |
+| configdrive |  |  |
+| digitalocean | DefaultAddress |  |
+| ec2 | DefaultAddress |  |
+| file | path |  |
+| gce |  |  |
+| packet | DefaultAddress |  |
+| url | url |  |
+| vmware |  | set `guestinfo.cloud-init.data.data`, `guestinfo.cloud-init.data.encoding`, or `guestinfo.cloud-init.data.url` |
+| * | This will add ["configdrive", "vmware", "ec2", "digitalocean", "packet", "gce"] into the list of datasources to try |  |
 
 ### Cloud-Config
 
diff --git a/init/init.go b/init/init.go
index cd580413..ab49e6e0 100755
--- a/init/init.go
+++ b/init/init.go
@@ -300,6 +300,11 @@ func RunInit() error {
 		}},
 		config.CfgFuncData{"cloud-init", func(cfg *config.CloudConfig) (*config.CloudConfig, error) {
 			cfg.Rancher.CloudInit.Datasources = config.LoadConfigWithPrefix(state).Rancher.CloudInit.Datasources
+			hypervisor := checkHypervisor(cfg)
+			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)
 			}
@@ -362,10 +367,6 @@ func RunInit() error {
 
 			return cfg, nil
 		}},
-		config.CfgFuncData{"detect hypervisor", func(cfg *config.CloudConfig) (*config.CloudConfig, error) {
-			checkHypervisor()
-			return config.LoadConfig(), nil
-		}},
 		config.CfgFuncData{"b2d Env", func(cfg *config.CloudConfig) (*config.CloudConfig, error) {
 
 			if boot2DockerEnvironment {
@@ -409,7 +410,7 @@ func RunInit() error {
 	return pidOne()
 }
 
-func checkHypervisor() {
+func checkHypervisor(cfg *config.CloudConfig) string {
 	hvtools := cpuid.CPU.HypervisorName
 	if hvtools != "" {
 		log.Infof("Detected Hypervisor: %s", cpuid.CPU.HypervisorName)
@@ -421,4 +422,5 @@ func checkHypervisor() {
 			log.Error(err)
 		}
 	}
+	return cpuid.CPU.HypervisorName
 }