rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-25 12:47:20 +00:00
Code Issues Releases Wiki Activity

ovfenv: always fallback to reading variables from vm params

Browse Source
This commit is contained in:
Sergej Nikolaev
2018-09-26 12:27:44 +03:00
parent 693f9fc108
commit 7d66bd5c41
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config/cloudinit/datasource/vmware/vmware_amd64.go
View File

@@ -33,7 +33,10 @@ type ovfWrapper struct {
} }
func (ovf ovfWrapper) readConfig(key string) (string, error) { 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 { func NewDatasource(fileName string) *VMWare {