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

fix the getting of the user-data metadata

Browse Source 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
This commit is contained in:
Sven Dowideit
2017-05-19 01:40:20 +00:00
parent 4ae80319dd
commit 42e366a821
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/cloudinit/datasource/metadata/gce/metadata.go
View File

@@ -142,11 +142,13 @@ func (ms MetadataService) fetchIP(key string) (net.IP, error) {
} }
func (ms MetadataService) FetchUserdata() ([]byte, error) { func (ms MetadataService) FetchUserdata() ([]byte, error) {
data, err := ms.FetchData(ms.MetadataURL()) // see https://github.com/number5/cloud-init/blob/master/cloudinit/sources/DataSourceGCE.py
data, err := ms.FetchData(ms.UserdataURL())
if err != nil { if err != nil {
return nil, err return nil, err
} }
if len(data) == 0 { if len(data) == 0 {
// see https://cloud.google.com/deployment-manager/docs/step-by-step-guide/setting-metadata-and-startup-scripts
data, err = ms.FetchData(ms.MetadataURL() + "instance/attributes/startup-script") data, err = ms.FetchData(ms.MetadataURL() + "instance/attributes/startup-script")
if err != nil { if err != nil {
return nil, err return nil, err