Index: environs/openstack/provider.go |
=== modified file 'environs/openstack/provider.go' |
--- environs/openstack/provider.go 2013-03-04 22:32:00 +0000 |
+++ environs/openstack/provider.go 2013-03-06 19:28:46 +0000 |
@@ -168,7 +168,7 @@ |
// metadataJSON holds the path of the instance's JSON metadata. |
// It is a variable so that tests can change it when needed. |
-var metadataJSON = "2012-08-10/meta-data.json" |
+var metadataJSON = "2012-08-10/meta_data.json" |
// fetchMetadata fetches a single atom of data from the openstack instance metadata service. |
// http://docs.amazonwebservices.com/AWSEC2/latest/UserGuide/AESDG-chapter-instancedata.html |
@@ -186,7 +186,7 @@ |
// the same thing as the "instance-id" in the ec2-style metadata. This only |
// works on openstack Folsom or later. |
func fetchInstanceUUID() (string, error) { |
- uri := fmt.Sprintf("%s/%s", metadataHost, metadataJSON) |
+ uri := fmt.Sprintf("%s/openstack/%s", metadataHost, metadataJSON) |
data, err := retryGet(uri) |
if err != nil { |
return "", err |