diff options
| author | Cory Wright <cory.wright@rackspace.com> | 2010-12-20 17:51:56 -0500 |
|---|---|---|
| committer | Cory Wright <cory.wright@rackspace.com> | 2010-12-20 17:51:56 -0500 |
| commit | 63d9378bccf5500e96037956f07618e86c5d38eb (patch) | |
| tree | 027facde9188c2ee50d0b9fe5c58150eb4c4245c /nova/flags.py | |
| parent | ab0cba603d96e25ee151222bb5fcf550459cfc7a (diff) | |
| parent | 086f2d87be3c56ac8dafaf4551096868d57454db (diff) | |
Merge commit
Diffstat (limited to 'nova/flags.py')
| -rw-r--r-- | nova/flags.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/nova/flags.py b/nova/flags.py index 87444565a..8fa0beb7a 100644 --- a/nova/flags.py +++ b/nova/flags.py @@ -235,12 +235,11 @@ DEFINE_string('ec2_url', 'http://127.0.0.1:8773/services/Cloud', DEFINE_string('default_image', 'ami-11111', 'default image to use, testing only') -DEFINE_string('default_kernel', 'aki-11111', - 'default kernel to use, testing only') -DEFINE_string('default_ramdisk', 'ari-11111', - 'default ramdisk to use, testing only') DEFINE_string('default_instance_type', 'm1.small', 'default instance type to use, testing only') +DEFINE_string('null_kernel', 'nokernel', + 'kernel image that indicates not to use a kernel,' + ' but to use a raw disk image instead') DEFINE_string('vpn_image_id', 'ami-CLOUDPIPE', 'AMI for cloudpipe vpn server') DEFINE_string('vpn_key_suffix', |