Merge pull request #171 from crawford/err

metadata-service: Handle no user-data
2014-07-01 16:15:32 -07:00 · 2014-07-01 16:15:32 -07:00 · 19b4b1160e
commit 19b4b1160e
parent 7d89aefb82 ce6fccfb3c
1 changed files with 8 additions and 1 deletions
--- a/datasource/metadata_service.go
+++ b/datasource/metadata_service.go
@ -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 {