rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-07-06 19:38:37 +00:00
Code Issues Releases Wiki Activity

ignore vmware datasource when guestinfo is empty

Browse Source
This commit is contained in:
Jason-ZW 2018-10-12 11:39:21 +08:00 committed by niusmallnan
parent ab4e0e590b
commit e8b6c69fbf
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,9 +78,14 @@ func (v VMWare) IsAvailable() bool {
}
if v.ovfFileName != "" {
_, v.lastError = os.Stat(v.ovfFileName)
return !os.IsNotExist(v.lastError)
if !os.IsNotExist(v.lastError) {
// when GuestInfo is empty, the DataSource should not be available.
return v.checkGuestInfo()
}
return false
}
return vmcheck.IsVirtualWorld()
// when GuestInfo is empty, the DataSource should not be available.
return vmcheck.IsVirtualWorld() && v.checkGuestInfo()
}
func readConfig(key string) (string, error) {
@ -107,3 +112,23 @@ func urlDownload(url string) ([]byte, error) {
client := pkg.NewHTTPClient()
return client.GetRetry(url)
}
func (v VMWare) checkGuestInfo() bool {
userData, err := v.FetchUserdata()
if err == nil && string(userData) != "" {
return true
}
metadata, err := v.FetchMetadata()
if err == nil {
if metadata.Hostname != "" {
return true
}
if len(metadata.NetworkConfig.DNS.Nameservers) > 0 || len(metadata.NetworkConfig.DNS.Search) > 0 {
return true
}
if len(metadata.NetworkConfig.Interfaces) > 0 {
return true
}
}
return false
}