summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorMasanori Itoh <itoumsn@nttdata.co.jp>2011-03-04 10:47:17 +0900
committerMasanori Itoh <itoumsn@nttdata.co.jp>2011-03-04 10:47:17 +0900
commit0265cf6f3f60e1354610064340cc1b21dfa79353 (patch)
tree65fd456ffcf0dda49abb3189be311c6452376e92 /nova/api
parent6606b4d438327b5405ef810c26cf801fa64433eb (diff)
parent458bf9682df0514a7f180f1ab1566bb7846cd281 (diff)
Merged to trunk rev 759.
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 844ccbe5e..c6309f03c 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -298,7 +298,7 @@ class CloudController(object):
'keyFingerprint': key_pair['fingerprint'],
})
- return {'keypairsSet': result}
+ return {'keySet': result}
def create_key_pair(self, context, key_name, **kwargs):
LOG.audit(_("Create key pair %s"), key_name, context=context)