← Back to branch summary

~justin-fathomdb/nova/raw-disk-images

« back to all changes in this revision

Viewing changes to nova/endpoint/cloud.py

  • Committer: Justin Santa Barbara
  • Date: 2010-08-01 03:49:21 UTC
  • Revision ID: justinsb@justinsb-desktop-20100801034921-9hqpxo00pl2p6pwc
Recognize 'magic' kernel value that means "don't use a kernel" - currently aki-00000000

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/endpoint/cloud.py
523
523
        kernel_id = kwargs.get('kernel_id', kernel_id)
524
524
        ramdisk_id = kwargs.get('ramdisk_id', ramdisk_id)
525
525
 
 
526
        if kernel_id == str(FLAGS.null_kernel):
 
527
            kernel_id = None
 
528
            ramdisk_id = None
 
529
            
526
530
        # make sure we have access to kernel and ramdisk
527
 
        self._get_image(context, kernel_id)
528
 
        self._get_image(context, ramdisk_id)
 
531
        if kernel_id:
 
532
            self._get_image(context, kernel_id)
 
533
        if ramdisk_id:
 
534
            self._get_image(context, ramdisk_id)
529
535
 
530
536
        logging.debug("Going to run instances...")
531
537
        reservation_id = utils.generate_uid('r')