diff options
| author | Armando Migliaccio <armando.migliaccio@citrix.com> | 2010-12-21 12:08:20 +0000 |
|---|---|---|
| committer | Armando Migliaccio <armando.migliaccio@citrix.com> | 2010-12-21 12:08:20 +0000 |
| commit | 4cf47fcb9aedab76b24e4afbcfa809e613bef980 (patch) | |
| tree | 7998ea9dad6ab1e3f0b3b93c6a46032707e2f8ad /nova/flags.py | |
| parent | b69946adc893256a5a857cfeedb0f80968b453a0 (diff) | |
| parent | 086f2d87be3c56ac8dafaf4551096868d57454db (diff) | |
| download | nova-4cf47fcb9aedab76b24e4afbcfa809e613bef980.tar.gz nova-4cf47fcb9aedab76b24e4afbcfa809e613bef980.tar.xz nova-4cf47fcb9aedab76b24e4afbcfa809e613bef980.zip | |
merge trunk
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', |