diff options
| author | jaypipes@gmail.com <> | 2011-03-16 19:02:17 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-03-16 19:02:17 +0000 |
| commit | 7dbda7ca270ee5109f307be3d0f1fb7c0336ce21 (patch) | |
| tree | 1d3683f4d904ab682463aed5412ded401ecf6279 /nova/api | |
| parent | 9fa74cdae1dcf94586ddb7924c044cb26112b67b (diff) | |
| parent | 663c1726d9a96540b8fd729223fcb34d7cf3cdf7 (diff) | |
| download | nova-7dbda7ca270ee5109f307be3d0f1fb7c0336ce21.tar.gz nova-7dbda7ca270ee5109f307be3d0f1fb7c0336ce21.tar.xz nova-7dbda7ca270ee5109f307be3d0f1fb7c0336ce21.zip | |
Keypairs are not required in the OpenStack API; don't require them!
This cleans up some weirdness from the original branch (https://code.launchpad.net/~justin-fathomdb/nova/bug732204/+merge/53359) with justin's LP username in r804.
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 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', [])) |