diff options
| author | Soren Hansen <soren.hansen@rackspace.com> | 2010-10-04 22:32:00 +0200 |
|---|---|---|
| committer | Soren Hansen <soren.hansen@rackspace.com> | 2010-10-04 22:32:00 +0200 |
| commit | bdbca3bc8f2c0503915017c72f20c2bc4210ead5 (patch) | |
| tree | 359e3a3d01b546e28623647d3d317fc3118bd952 /nova/flags.py | |
| parent | 6805d7d4a03b977ca7ef99da2a59a486672d8995 (diff) | |
| parent | 44d9fac26aff296f2846b00df98ddaf646c52158 (diff) | |
Merge trunk.
Diffstat (limited to 'nova/flags.py')
| -rw-r--r-- | nova/flags.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/nova/flags.py b/nova/flags.py index ed0baee65..c32cdd7a4 100644 --- a/nova/flags.py +++ b/nova/flags.py @@ -167,6 +167,9 @@ def DECLARE(name, module_string, flag_values=FLAGS): # 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_list('region_list', + [], + 'list of region=url pairs separated by commas') DEFINE_string('connection_type', 'libvirt', 'libvirt, xenapi or fake') DEFINE_integer('s3_port', 3333, 's3 port') DEFINE_string('s3_host', '127.0.0.1', 's3 host') @@ -185,6 +188,8 @@ DEFINE_string('rabbit_userid', 'guest', 'rabbit userid') DEFINE_string('rabbit_password', 'guest', 'rabbit password') DEFINE_string('rabbit_virtual_host', '/', 'rabbit virtual host') DEFINE_string('control_exchange', 'nova', 'the main exchange to connect to') +DEFINE_string('cc_host', '127.0.0.1', 'ip of api server') +DEFINE_integer('cc_port', 8773, 'cloud controller port') DEFINE_string('ec2_url', 'http://127.0.0.1:8773/services/Cloud', 'Url to ec2 api server') |