From 7d66bd5c410ca4aaae3cd10f647685b706c592eb Mon Sep 17 00:00:00 2001
From: Sergej Nikolaev <nikolaevsa@minbank.ru>
Date: Wed, 26 Sep 2018 12:27:44 +0300
Subject: [PATCH] ovfenv: always fallback to reading variables from vm params

---
 config/cloudinit/datasource/vmware/vmware_amd64.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/config/cloudinit/datasource/vmware/vmware_amd64.go b/config/cloudinit/datasource/vmware/vmware_amd64.go
index a0b71c27..4dbfe128 100644
--- a/config/cloudinit/datasource/vmware/vmware_amd64.go
+++ b/config/cloudinit/datasource/vmware/vmware_amd64.go
@@ -33,7 +33,10 @@ type ovfWrapper struct {
 }
 
 func (ovf ovfWrapper) readConfig(key string) (string, error) {
-	return ovf.env.Properties["guestinfo."+key], nil
+	if val := ovf.env.Properties["guestinfo."+key]; val != "" {
+		return val, nil
+	}
+	return readConfig(key)
 }
 
 func NewDatasource(fileName string) *VMWare {