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

Merge pull request #173 from crawford/metadata

Browse Source 
metadata-service: remove check for OpenStack meta_data.json
This commit is contained in:
Alex Crawford 2014-07-02 15:19:37 -07:00
commit 52c44923dd
2 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
datasource/metadata_service.go
View File

@ -27,7 +27,6 @@ const (
Ec2MetadataUrl = BaseUrl + Ec2ApiVersion + "/meta-data" Ec2MetadataUrl = BaseUrl + Ec2ApiVersion + "/meta-data"
OpenstackApiVersion = "openstack/2012-08-10" OpenstackApiVersion = "openstack/2012-08-10"
OpenstackUserdataUrl = BaseUrl + OpenstackApiVersion + "/user_data" OpenstackUserdataUrl = BaseUrl + OpenstackApiVersion + "/user_data"
OpenstackMetadataUrl = BaseUrl + OpenstackApiVersion + "/meta_data.json"
) )
type metadataService struct{} type metadataService struct{}
@ -80,12 +79,6 @@ func (ms *metadataService) Type() string {
} }
func fetchMetadata(client getter) ([]byte, error) { func fetchMetadata(client getter) ([]byte, error) {
if metadata, err := client.GetRetry(OpenstackMetadataUrl); err == nil {
return metadata, nil
} else if _, ok := err.(pkg.ErrTimeout); ok {
return nil, err
}
attrs := make(map[string]interface{}) attrs := make(map[string]interface{})
if keynames, err := fetchAttributes(client, fmt.Sprintf("%s/public-keys", Ec2MetadataUrl)); err == nil { if keynames, err := fetchAttributes(client, fmt.Sprintf("%s/public-keys", Ec2MetadataUrl)); err == nil {
keyIDs := make(map[string]string) keyIDs := make(map[string]string)

6
datasource/metadata_service_test.go
View File

@ -145,12 +145,6 @@ func TestFetchMetadata(t *testing.T) {
}, },
expect: []byte(`{"hostname":"host","network_config":{"content_path":"path"},"public_keys":{"test1":"key"}}`), expect: []byte(`{"hostname":"host","network_config":{"content_path":"path"},"public_keys":{"test1":"key"}}`),
}, },
{
metadata: map[string]string{
"http://169.254.169.254/openstack/2012-08-10/meta_data.json": "test",
},
expect: []byte("test"),
},
{err: pkg.ErrTimeout{fmt.Errorf("test error")}}, {err: pkg.ErrTimeout{fmt.Errorf("test error")}},
} { } {
client := &TestHttpClient{tt.metadata, tt.err} client := &TestHttpClient{tt.metadata, tt.err}