Compare commits

...

4 Commits

Author SHA1 Message Date
Alex Crawford
43be8c8996 coreos-cloudinit: bump to 0.8.6 2014-07-01 16:16:41 -07:00
Alex Crawford
19b4b1160e Merge pull request #171 from crawford/err
metadata-service: Handle no user-data
2014-07-01 16:15:32 -07:00
Alex Crawford
ce6fccfb3c metadata-service: Handle no user-data 2014-07-01 16:10:18 -07:00
Alex Crawford
7d89aefb82 coreos-cloudinit: bump to 0.8.5+git 2014-07-01 15:45:49 -07:00
2 changed files with 9 additions and 2 deletions

View File

@@ -14,7 +14,7 @@ import (
)
const (
version = "0.8.5"
version = "0.8.6"
datasourceInterval = 100 * time.Millisecond
datasourceMaxInterval = 30 * time.Second
datasourceTimeout = 5 * time.Minute

View File

@@ -65,7 +65,14 @@ func (ms *metadataService) FetchUserdata() ([]byte, error) {
} else if _, ok := err.(pkg.ErrTimeout); ok {
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 {