diff options
| author | Justin Santa Barbara <justin@fathomdb.com> | 2011-03-14 20:07:06 -0700 |
|---|---|---|
| committer | Justin Santa Barbara <justin@fathomdb.com> | 2011-03-14 20:07:06 -0700 |
| commit | cc0340d7f9d9ab9b082af35df9b486c1e9a5a967 (patch) | |
| tree | 0c12691bd06b3b47bd01e61f5f79aeb73964f1f0 | |
| parent | 5da32f8b917d461388d0186af52946a3f7d2c665 (diff) | |
| parent | a4e94971b696681a5ced189d8f4263c8f77cc531 (diff) | |
| download | nova-cc0340d7f9d9ab9b082af35df9b486c1e9a5a967.tar.gz nova-cc0340d7f9d9ab9b082af35df9b486c1e9a5a967.tar.xz nova-cc0340d7f9d9ab9b082af35df9b486c1e9a5a967.zip | |
Merge remote branch 'justinsb/bug732204' into bug732204
| -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 dc28a0782..47ed254ec 100644 --- a/nova/api/openstack/servers.py +++ b/nova/api/openstack/servers.py @@ -146,10 +146,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']) @@ -174,8 +178,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, onset_files=env.get('onset_files', [])) |