diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-07-28 22:50:33 +0000 |
|---|---|---|
| committer | Tarmac <> | 2010-07-28 22:50:33 +0000 |
| commit | 96995456ccd24ec46f703bfa3e784eb193858bbb (patch) | |
| tree | f6b6377dd117ff387d8ae45e50f8fd2a58e4d291 | |
| parent | c0e3fd6d728abe012f10a55c4f2bf2c895a6c724 (diff) | |
| parent | a46e9aecb9a0de4d06dc00979795b33f788959fa (diff) | |
| download | nova-96995456ccd24ec46f703bfa3e784eb193858bbb.tar.gz nova-96995456ccd24ec46f703bfa3e784eb193858bbb.tar.xz nova-96995456ccd24ec46f703bfa3e784eb193858bbb.zip | |
Use default kernel and ramdisk properly by default.
| -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 0940c5d8a..acba50b95 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) |