diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-12-16 22:52:08 +0000 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-12-16 22:52:08 +0000 |
| commit | 26ebccc8d92aba23efa1663fe9949c141a4cc671 (patch) | |
| tree | b5c5724d1f806051ffd30b9a8596c52f6a890351 /smoketests/flags.py | |
| parent | dc29400d104d34c6383132a43e018f7724e85ec3 (diff) | |
| parent | cd460a1f661eea7e050891f50a8218fdf24f2c6f (diff) | |
| download | nova-26ebccc8d92aba23efa1663fe9949c141a4cc671.tar.gz nova-26ebccc8d92aba23efa1663fe9949c141a4cc671.tar.xz nova-26ebccc8d92aba23efa1663fe9949c141a4cc671.zip | |
merged trunk, fixed conflicts and tests
Diffstat (limited to 'smoketests/flags.py')
| -rw-r--r-- | smoketests/flags.py | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/smoketests/flags.py b/smoketests/flags.py index 3617fb797..ae4d09508 100644 --- a/smoketests/flags.py +++ b/smoketests/flags.py @@ -1,7 +1,7 @@ # vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2010 United States Government as represented by the -# Administrator of the National Aeronautics and Space Administration. +# Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may @@ -33,13 +33,6 @@ DEFINE_bool = DEFINE_bool # __GLOBAL FLAGS ONLY__ # Define any app-specific flags in their own files, docs at: # http://code.google.com/p/python-gflags/source/browse/trunk/gflags.py#39 -DEFINE_string('admin_access_key', 'admin', 'Access key for admin user') -DEFINE_string('admin_secret_key', 'admin', 'Secret key for admin user') -DEFINE_string('clc_ip', '127.0.0.1', 'IP of cloud controller API') -DEFINE_string('bundle_kernel', 'openwrt-x86-vmlinuz', - 'Local kernel file to use for bundling tests') -DEFINE_string('bundle_image', 'openwrt-x86-ext2.image', - 'Local image file to use for bundling tests') -#DEFINE_string('vpn_image_id', 'ami-CLOUDPIPE', -# 'AMI for cloudpipe vpn server') +DEFINE_string('region', 'nova', 'Region to use') +DEFINE_string('test_image', 'ami-tiny', 'Image to use for launch tests') |