summaryrefslogtreecommitdiff
path: root/cloudinit/sources
diff options
context:
space:
mode:
authorJoshua Harlow <harlowja@yahoo-inc.com>2012-10-05 14:50:22 -0700
committerJoshua Harlow <harlowja@yahoo-inc.com>2012-10-05 14:50:22 -0700
commit5b4fa81016f487fb6e041cef5a3b4ac0bd0863c5 (patch)
tree467ddac43fb887ff13898feb02e7d63c772e7c19 /cloudinit/sources
parentffa19cbd80ba10453f0ef448c1c10dbcbf5be504 (diff)
downloadvyos-cloud-init-5b4fa81016f487fb6e041cef5a3b4ac0bd0863c5.tar.gz
vyos-cloud-init-5b4fa81016f487fb6e041cef5a3b4ac0bd0863c5.zip
Add tests to show that the assigned bug is fixed.
Also fix the extraction of the metadata key name since it actually uses 'dashes' instead of being a single word.
Diffstat (limited to 'cloudinit/sources')
-rw-r--r--cloudinit/sources/DataSourceConfigDrive.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/sources/DataSourceConfigDrive.py b/cloudinit/sources/DataSourceConfigDrive.py
index 495eee82..eebe44ec 100644
--- a/cloudinit/sources/DataSourceConfigDrive.py
+++ b/cloudinit/sources/DataSourceConfigDrive.py
@@ -285,7 +285,7 @@ def read_config_drive_dir_v2(source_dir, version="2012-08-10"):
('metadata',
"openstack/%s/meta_data.json" % version, True, json.loads),
('userdata', "openstack/%s/user_data" % version, False, None),
- ('ec2-metadata', "ec2/latest/metadata.json", False, json.loads),
+ ('ec2-metadata', "ec2/latest/meta-data.json", False, json.loads),
)
results = {'userdata': None}