diff options
| author | Justin Santa Barbara <justinsb@justinsb-desktop> | 2010-07-31 20:51:09 -0700 |
|---|---|---|
| committer | Justin Santa Barbara <justinsb@justinsb-desktop> | 2010-07-31 20:51:09 -0700 |
| commit | 08f8bb4183a5a44f71c4c447a46668ecff6a03fb (patch) | |
| tree | ef0957a1fa3b27136c8ff316951937b3dc4a8590 | |
| parent | 7985f5fb32432630b3fef775f601900f89346ed2 (diff) | |
| parent | 6227cb13c311624998b9c2c6e55fc0d261cfcb6c (diff) | |
Merged with raw disk image
| -rw-r--r-- | nova/endpoint/cloud.py | 10 | ||||
| -rw-r--r-- | nova/flags.py | 3 |
2 files changed, 11 insertions, 2 deletions
diff --git a/nova/endpoint/cloud.py b/nova/endpoint/cloud.py index b4157e48c..344352a93 100644 --- a/nova/endpoint/cloud.py +++ b/nova/endpoint/cloud.py @@ -523,9 +523,15 @@ class CloudController(object): kernel_id = kwargs.get('kernel_id', kernel_id) ramdisk_id = kwargs.get('ramdisk_id', ramdisk_id) + if kernel_id == str(FLAGS.null_kernel): + kernel_id = None + ramdisk_id = None + # make sure we have access to kernel and ramdisk - self._get_image(context, kernel_id) - self._get_image(context, ramdisk_id) + if kernel_id: + self._get_image(context, kernel_id) + if ramdisk_id: + self._get_image(context, ramdisk_id) logging.debug("Going to run instances...") reservation_id = utils.generate_uid('r') diff --git a/nova/flags.py b/nova/flags.py index f35f5fa10..caae33e14 100644 --- a/nova/flags.py +++ b/nova/flags.py @@ -57,6 +57,9 @@ DEFINE_string('ec2_url', 'http://127.0.0.1:8773/services/Cloud', 'Url to ec2 api server') +DEFINE_string('null_kernel', + 'aki-00000000', + 'Kernel image that indicates not to use a kernel (use a raw disk image instead)') DEFINE_string('default_image', 'ami-11111', 'default image to use, testing only') |