diff options
| author | Ewan Mellor <ewan.mellor@citrix.com> | 2010-07-29 00:11:02 +0100 |
|---|---|---|
| committer | Ewan Mellor <ewan.mellor@citrix.com> | 2010-07-29 00:11:02 +0100 |
| commit | 9f4996e8738991a95a23cba2caa660f7002f94cd (patch) | |
| tree | e40bc2e56ea96131200d5e12918bf5a429bb5cc1 /nova/flags.py | |
| parent | c5edaa2186add12947185cb1fd47e0a48eccafa9 (diff) | |
| parent | f61b62983f62aa10d7bed3bc1c406717663be923 (diff) | |
| download | nova-9f4996e8738991a95a23cba2caa660f7002f94cd.tar.gz nova-9f4996e8738991a95a23cba2caa660f7002f94cd.tar.xz nova-9f4996e8738991a95a23cba2caa660f7002f94cd.zip | |
Merge with trunk, including fixing up conflicts with the removal of fake_users
and the reworking of node.py -> service.py.
Diffstat (limited to 'nova/flags.py')
| -rw-r--r-- | nova/flags.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/nova/flags.py b/nova/flags.py index dc8fc9d10..f35f5fa10 100644 --- a/nova/flags.py +++ b/nova/flags.py @@ -41,11 +41,12 @@ DEFINE_integer('s3_port', 3333, 's3 port') DEFINE_string('s3_host', '127.0.0.1', 's3 host') #DEFINE_string('cloud_topic', 'cloud', 'the topic clouds listen on') DEFINE_string('compute_topic', 'compute', 'the topic compute nodes listen on') -DEFINE_string('storage_topic', 'storage', 'the topic storage nodes listen on') +DEFINE_string('volume_topic', 'volume', 'the topic volume nodes listen on') +DEFINE_string('network_topic', 'network', 'the topic network nodes listen on') + DEFINE_bool('verbose', False, 'show debug output') DEFINE_boolean('fake_rabbit', False, 'use a fake rabbit') DEFINE_bool('fake_network', False, 'should we use fake network devices and addresses') -DEFINE_bool('fake_users', False, 'use fake users') DEFINE_string('rabbit_host', 'localhost', 'rabbit host') DEFINE_integer('rabbit_port', 5672, 'rabbit port') DEFINE_string('rabbit_userid', 'guest', 'rabbit userid') @@ -74,6 +75,8 @@ DEFINE_string('vpn_key_suffix', '-key', 'Suffix to add to project name for vpn key') +DEFINE_integer('auth_token_ttl', 3600, 'Seconds for auth tokens to linger') + # UNUSED DEFINE_string('node_availability_zone', 'nova', |