x/python-ganttclient
Code Issues Proposed changes

Move the reading of API parameters above the call to _get_image, so that

Browse Source 
they have a chance to take effect.
This commit is contained in:
Ewan Mellor
2010-07-29 03:22:42 +00:00
committed by Tarmac
parent 11fa77da3c eabf8551de
commit 012ec1f6e4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nova/endpoint/cloud.py
View File

@@ -519,14 +519,14 @@ class CloudController(object):
kernel_id = image.get('kernelId', FLAGS.default_kernel) kernel_id = image.get('kernelId', FLAGS.default_kernel)
ramdisk_id = image.get('ramdiskId', FLAGS.default_ramdisk) 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 # API parameters overrides of defaults
kernel_id = kwargs.get('kernel_id', kernel_id) kernel_id = kwargs.get('kernel_id', kernel_id)
ramdisk_id = kwargs.get('ramdisk_id', ramdisk_id) ramdisk_id = kwargs.get('ramdisk_id', ramdisk_id)
# make sure we have access to kernel and ramdisk
self._get_image(context, kernel_id)
self._get_image(context, ramdisk_id)
logging.debug("Going to run instances...") logging.debug("Going to run instances...")
reservation_id = utils.generate_uid('r') reservation_id = utils.generate_uid('r')
launch_time = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime()) launch_time = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime())