diff options
| author | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-05-25 08:22:51 -0700 |
|---|---|---|
| committer | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-05-25 08:22:51 -0700 |
| commit | 30b6d5e2722d1c92115f668b405dc7eed9cc27b2 (patch) | |
| tree | 9108fe915bbe4ee6049eee7592a6abb9f54a98ec /nova/api | |
| parent | 714fe839580d4858417592608e4bf95ac26cf5d1 (diff) | |
| parent | 6f3f188e4ca9136f293ecf4b9813a7615c7a5929 (diff) | |
| download | nova-30b6d5e2722d1c92115f668b405dc7eed9cc27b2.tar.gz nova-30b6d5e2722d1c92115f668b405dc7eed9cc27b2.tar.xz nova-30b6d5e2722d1c92115f668b405dc7eed9cc27b2.zip | |
trunk merge
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/__init__.py | 4 | ||||
| -rw-r--r-- | nova/api/openstack/servers.py | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py index cd59340bd..c13993dd3 100644 --- a/nova/api/ec2/__init__.py +++ b/nova/api/ec2/__init__.py @@ -338,6 +338,10 @@ class Executor(wsgi.Application): else: return self._error(req, context, type(ex).__name__, unicode(ex)) + except exception.KeyPairExists as ex: + LOG.debug(_('KeyPairExists raised: %s'), unicode(ex), + context=context) + return self._error(req, context, type(ex).__name__, unicode(ex)) except Exception as ex: extra = {'environment': req.environ} LOG.exception(_('Unexpected error raised: %s'), unicode(ex), diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py index 8f2de2afe..fcb630fae 100644 --- a/nova/api/openstack/servers.py +++ b/nova/api/openstack/servers.py @@ -609,7 +609,8 @@ class ControllerV10(Controller): def _parse_update(self, context, server_id, inst_dict, update_dict): if 'adminPass' in inst_dict['server']: update_dict['admin_pass'] = inst_dict['server']['adminPass'] - self.compute_api.set_admin_password(context, server_id) + self.compute_api.set_admin_password(context, server_id, + inst_dict['server']['adminPass']) def _action_rebuild(self, info, request, instance_id): context = request.environ['nova.context'] |