unistack-org/cloudinit
4
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #171 from crawford/err

Browse Source 
metadata-service: Handle no user-data
This commit is contained in:
Alex Crawford 2014-07-01 16:15:32 -07:00
commit 19b4b1160e
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
datasource/metadata_service.go
View File

@ -65,7 +65,14 @@ func (ms *metadataService) FetchUserdata() ([]byte, error) {
} else if _, ok := err.(pkg.ErrTimeout); ok { } else if _, ok := err.(pkg.ErrTimeout); ok {
return data, err return data, err
} }
return client.GetRetry(OpenstackUserdataUrl)
if data, err := client.GetRetry(OpenstackUserdataUrl); err == nil {
return data, err
} else if _, ok := err.(pkg.ErrNotFound); ok {
return []byte{}, nil
} else {
return data, err
}
} }
func (ms *metadataService) Type() string { func (ms *metadataService) Type() string {