merged Justin Santa Barbara's raw-disk-image back into the latest trunk

This commit is contained in:
Rick Clark
2010-11-30 11:52:43 -06:00

View File

@@ -236,6 +236,9 @@ 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', 'aki-00000000',
'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',