diff options
| author | Mark Washenberger <mark.washenberger@rackspace.com> | 2011-03-16 15:16:16 -0400 |
|---|---|---|
| committer | Mark Washenberger <mark.washenberger@rackspace.com> | 2011-03-16 15:16:16 -0400 |
| commit | 19a2f8ce5174fa758de9031d64f1bed0f7c44788 (patch) | |
| tree | 7e0427cf065faf6829b1bcb6af444796bc2b8ce2 /nova/api | |
| parent | fc07caece79e379b6d6f2a3220806af9271e349b (diff) | |
| parent | 7dbda7ca270ee5109f307be3d0f1fb7c0336ce21 (diff) | |
| download | nova-19a2f8ce5174fa758de9031d64f1bed0f7c44788.tar.gz nova-19a2f8ce5174fa758de9031d64f1bed0f7c44788.tar.xz nova-19a2f8ce5174fa758de9031d64f1bed0f7c44788.zip | |
merge lp:nova and resolve conflicts
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/servers.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py index ea88f1fdc..3ecd4fb01 100644 --- a/nova/api/openstack/servers.py +++ b/nova/api/openstack/servers.py @@ -148,10 +148,14 @@ class Controller(wsgi.Controller): return faults.Fault(exc.HTTPUnprocessableEntity()) context = req.environ['nova.context'] + + key_name = None + key_data = None key_pairs = auth_manager.AuthManager.get_key_pairs(context) - if not key_pairs: - raise exception.NotFound(_("No keypairs defined")) - key_pair = key_pairs[0] + if key_pairs: + key_pair = key_pairs[0] + key_name = key_pair['name'] + key_data = key_pair['public_key'] image_id = common.get_image_id_from_image_hash(self._image_service, context, env['server']['imageId']) @@ -180,8 +184,8 @@ class Controller(wsgi.Controller): ramdisk_id=ramdisk_id, display_name=env['server']['name'], display_description=env['server']['name'], - key_name=key_pair['name'], - key_data=key_pair['public_key'], + key_name=key_name, + key_data=key_data, metadata=metadata, injected_files=injected_files) except QuotaError as error: |