rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-19 09:22:40 +00:00
Code Issues Releases Wiki Activity

Add proper vmware cloud-init datasource from guestinfo

Browse Source 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
This commit is contained in:
Sven Dowideit
2017-06-17 22:56:25 +10:00
parent e37b7c5331
commit 51aff79c7e
4 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config/cloudinit/datasource/vmware/vmware.go
View File

@@ -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
}