summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2011-09-08 17:42:49 -0700
committerScott Moser <smoser@ubuntu.com>2011-09-08 17:42:49 -0700
commitf2c887824cd56fe83f4db2bf94279684a1daba05 (patch)
tree34fbd3b4c5e8f3fbcae7bed067a39a5918fadc13 /nova/api
parenta8acd5fbd55ad4cd2cd502e95b2399657fbd162f (diff)
downloadnova-f2c887824cd56fe83f4db2bf94279684a1daba05.tar.gz
nova-f2c887824cd56fe83f4db2bf94279684a1daba05.tar.xz
nova-f2c887824cd56fe83f4db2bf94279684a1daba05.zip
metadata key is 'public-keys', not 'keys'
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/ec2/cloud.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index c6f24858a..c8ff47864 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -337,7 +337,7 @@ class CloudController(object):
# public-keys should only show up if it is non-empty (if user specified one)
if instance_ref['key_name']:
- data['keys'] = {'0': {'_name': instance_ref['key_name'],
+ data['public-keys'] = {'0': {'_name': instance_ref['key_name'],
'openssh-key': instance_ref['key_data']}}
for image_type in ['kernel', 'ramdisk']: