diff options
| author | Ewan Mellor <ewan.mellor@citrix.com> | 2010-07-29 00:58:33 +0100 |
|---|---|---|
| committer | Ewan Mellor <ewan.mellor@citrix.com> | 2010-07-29 00:58:33 +0100 |
| commit | 04a6a0267e7dc0f4e587e43f23b4acf0dcef52fc (patch) | |
| tree | 6bcdfafed1cb2332ebd8b7c0d03b4fed4a82520e /nova/endpoint | |
| parent | 9f4996e8738991a95a23cba2caa660f7002f94cd (diff) | |
| download | nova-04a6a0267e7dc0f4e587e43f23b4acf0dcef52fc.tar.gz nova-04a6a0267e7dc0f4e587e43f23b4acf0dcef52fc.tar.xz nova-04a6a0267e7dc0f4e587e43f23b4acf0dcef52fc.zip | |
More merges from trunk. Not everything came over the first time.
Diffstat (limited to 'nova/endpoint')
| -rwxr-xr-x | nova/endpoint/api.py | 2 | ||||
| -rw-r--r-- | nova/endpoint/cloud.py | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/nova/endpoint/api.py b/nova/endpoint/api.py index 8915e4742..78a18b9ea 100755 --- a/nova/endpoint/api.py +++ b/nova/endpoint/api.py @@ -266,7 +266,7 @@ class APIRequestHandler(tornado.web.RequestHandler): # Authenticate the request. try: - (user, project) = users.UserManager.instance().authenticate( + (user, project) = manager.AuthManager().authenticate( access, signature, auth_params, diff --git a/nova/endpoint/cloud.py b/nova/endpoint/cloud.py index 21581ffd2..8a4edbc0b 100644 --- a/nova/endpoint/cloud.py +++ b/nova/endpoint/cloud.py @@ -516,8 +516,12 @@ class CloudController(object): # get defaults from imagestore image_id = image['imageId'] - kernel_id = image.get('kernelId', None) - ramdisk_id = image.get('ramdiskId', None) + kernel_id = image.get('kernelId', FLAGS.default_kernel) + ramdisk_id = image.get('ramdiskId', FLAGS.default_ramdisk) + + # make sure we have access to kernel and ramdisk + self._get_image(context, kernel_id) + self._get_image(context, ramdisk_id) # API parameters overrides of defaults kernel_id = kwargs.get('kernel_id', kernel_id) |