summaryrefslogtreecommitdiffstats
path: root/nova/flags.py
diff options
context:
space:
mode:
authorJustin Santa Barbara <justinsb@justinsb-desktop>2010-10-14 13:38:35 -0700
committerJustin Santa Barbara <justinsb@justinsb-desktop>2010-10-14 13:38:35 -0700
commit9732c0af89f21490cc8d6bc80799bbc8b36fb441 (patch)
tree0edc878168a59d407223ec753a8611a6d154c798 /nova/flags.py
parentd8643f1e15f241db96893d1ea41083a2bee65dbd (diff)
downloadnova-9732c0af89f21490cc8d6bc80799bbc8b36fb441.tar.gz
nova-9732c0af89f21490cc8d6bc80799bbc8b36fb441.tar.xz
nova-9732c0af89f21490cc8d6bc80799bbc8b36fb441.zip
Minimized diff, fixed formatting
Diffstat (limited to 'nova/flags.py')
-rw-r--r--nova/flags.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/flags.py b/nova/flags.py
index 2b96a15f7..d2c22e46b 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -202,7 +202,8 @@ DEFINE_string('default_ramdisk', 'ari-11111',
DEFINE_string('default_instance_type', 'm1.small',
'default instance type to use, testing only')
DEFINE_string('null_kernel', 'aki-00000000',
- 'kernel image that indicates not to use a kernel, to use a raw disk image instead')
+ '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',