x/python-ganttclient
Code Issues Proposed changes

Use default kernel and ramdisk properly by default.

Browse Source
This commit is contained in:
Vishvananda Ishaya
2010-07-28 22:50:33 +00:00
committed by Tarmac
parent f98210666f 39e6c0b16f
commit 278d6acb4c
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nova/endpoint/cloud.py
View File

@@ -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)