diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-07-28 01:12:14 -0700 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-07-28 01:12:14 -0700 |
| commit | a46e9aecb9a0de4d06dc00979795b33f788959fa (patch) | |
| tree | 901f91e14690bb97516e57513ff3bdf0f26b3454 | |
| parent | 0d32008ea944071b99dea5a88805d78736e5f21e (diff) | |
| download | nova-a46e9aecb9a0de4d06dc00979795b33f788959fa.tar.gz nova-a46e9aecb9a0de4d06dc00979795b33f788959fa.tar.xz nova-a46e9aecb9a0de4d06dc00979795b33f788959fa.zip | |
use default kernel and ramdisk and check for legal access
| -rw-r--r-- | nova/endpoint/cloud.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/nova/endpoint/cloud.py b/nova/endpoint/cloud.py index 76ca35320..e7c4542f8 100644 --- a/nova/endpoint/cloud.py +++ b/nova/endpoint/cloud.py @@ -515,8 +515,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) |