diff options
| author | Brian Waldon <brian.waldon@rackspace.com> | 2011-04-26 15:48:28 -0700 |
|---|---|---|
| committer | Brian Waldon <brian.waldon@rackspace.com> | 2011-04-26 15:48:28 -0700 |
| commit | 64f40320a586d28345c38e4079b257e7a130c5db (patch) | |
| tree | bebe2cb4803913fa9b1518c7abb5e45c0427c12b /nova/api | |
| parent | a3f16d7efbdc51c75c1a729d9194ee3a66841bab (diff) | |
| parent | 5ea80e2f62e7a35967fc509aef8e7158577a2980 (diff) | |
merging trunk
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 049ca269f..94fbf19ff 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -61,8 +61,7 @@ def _gen_key(context, user_id, key_name): # creation before creating key_pair try: db.key_pair_get(context, user_id, key_name) - raise exception.Duplicate(_("The key_pair %s already exists") - % key_name) + raise exception.KeyPairExists(key_name=key_name) except exception.NotFound: pass private_key, public_key, fingerprint = crypto.generate_key_pair() |