summaryrefslogtreecommitdiffstats
path: root/nova/endpoint
diff options
context:
space:
mode:
authorDevin Carlen <devin.carlen@gmail.com>2010-07-28 18:24:52 +0000
committerDevin Carlen <devin.carlen@gmail.com>2010-07-28 18:24:52 +0000
commitd425ee86d389e8972a4e30ce5d26f1b3de96ebb7 (patch)
tree0117336e3e0aa0295895ff8fcd8853dbc933f81c /nova/endpoint
parente53caccb7a242bdabd4ea6aed914ab77cb1fca32 (diff)
parenta72fb79080df79306d947347e0ceb9be238c5cd8 (diff)
downloadnova-d425ee86d389e8972a4e30ce5d26f1b3de96ebb7.tar.gz
nova-d425ee86d389e8972a4e30ce5d26f1b3de96ebb7.tar.xz
nova-d425ee86d389e8972a4e30ce5d26f1b3de96ebb7.zip
Merged trunk
Diffstat (limited to 'nova/endpoint')
-rw-r--r--nova/endpoint/cloud.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/endpoint/cloud.py b/nova/endpoint/cloud.py
index 754b0780c..0940c5d8a 100644
--- a/nova/endpoint/cloud.py
+++ b/nova/endpoint/cloud.py
@@ -49,7 +49,8 @@ flags.DEFINE_string('cloud_topic', 'cloud', 'the topic clouds listen on')
def _gen_key(user_id, key_name):
""" Tuck this into AuthManager """
try:
- private_key, fingerprint = manager.AuthManager().generate_key_pair(user_id, key_name)
+ mgr = manager.AuthManager()
+ private_key, fingerprint = mgr.generate_key_pair(user_id, key_name)
except Exception as ex:
return {'exception': ex}
return {'private_key': private_key, 'fingerprint': fingerprint}