summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorJohn Tran <jtran@attinteractive.com>2011-03-18 11:49:11 -0700
committerJohn Tran <jtran@attinteractive.com>2011-03-18 11:49:11 -0700
commit5a9d2eb44ced0affe143e6274c9c9326f1c2d7da (patch)
treec653b5d6c5753d1f1e0e3fb2f38853c1178d6828 /nova/api
parent2002b0920fb4a5ad3403e2243eb19809b3cb631b (diff)
downloadnova-5a9d2eb44ced0affe143e6274c9c9326f1c2d7da.tar.gz
nova-5a9d2eb44ced0affe143e6274c9c9326f1c2d7da.tar.xz
nova-5a9d2eb44ced0affe143e6274c9c9326f1c2d7da.zip
created api endpoint to allow uploading of public key
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/ec2/cloud.py12
1 files changed, 12 insertions, 0 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index cadda97db..6fe01b0e9 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -302,6 +302,18 @@ class CloudController(object):
'keyMaterial': data['private_key']}
# TODO(vish): when context is no longer an object, pass it here
+ def import_public_key(self, context, key_name, public_key,
+ fingerprint=None):
+ LOG.audit(_("Import key %s"), key_name, context=context)
+ key = {}
+ key['user_id'] = context.user_id
+ key['name'] = key_name
+ key['public_key'] = public_key
+ if fingerprint:
+ key['fingerprint'] = fingerprint
+ db.key_pair_create(context, key)
+ return True
+
def delete_key_pair(self, context, key_name, **kwargs):
LOG.audit(_("Delete key pair %s"), key_name, context=context)
try: