diff options
| author | Soren Hansen <soren@linux2go.dk> | 2011-03-14 14:21:44 +0100 |
|---|---|---|
| committer | Soren Hansen <soren@linux2go.dk> | 2011-03-14 14:21:44 +0100 |
| commit | 04838ee14d0ac6df0052fba465cdf7f765c66ae5 (patch) | |
| tree | bbb4422e623d93da0a3c234cf75ef894934ee954 /nova/flags.py | |
| parent | c8fc7ed48be84e3b39ab88c8c103fbe52b6718e1 (diff) | |
| parent | 3fb5da952e041f88a29ad0b049c52236b84954e9 (diff) | |
| download | nova-04838ee14d0ac6df0052fba465cdf7f765c66ae5.tar.gz nova-04838ee14d0ac6df0052fba465cdf7f765c66ae5.tar.xz nova-04838ee14d0ac6df0052fba465cdf7f765c66ae5.zip | |
Merge trunk
Diffstat (limited to 'nova/flags.py')
| -rw-r--r-- | nova/flags.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/nova/flags.py b/nova/flags.py index 8cf199b2f..9123e9ac7 100644 --- a/nova/flags.py +++ b/nova/flags.py @@ -321,6 +321,8 @@ DEFINE_integer('auth_token_ttl', 3600, 'Seconds for auth tokens to linger') DEFINE_string('state_path', os.path.join(os.path.dirname(__file__), '../'), "Top-level directory for maintaining nova's state") +DEFINE_string('lock_path', os.path.join(os.path.dirname(__file__), '../'), + "Directory for lock files") DEFINE_string('logdir', None, 'output to a per-service log file in named ' 'directory') @@ -346,7 +348,7 @@ DEFINE_string('scheduler_manager', 'nova.scheduler.manager.SchedulerManager', 'Manager for scheduler') # The service to use for image search and retrieval -DEFINE_string('image_service', 'nova.image.s3.S3ImageService', +DEFINE_string('image_service', 'nova.image.local.LocalImageService', 'The service to use for retrieving and searching for images.') DEFINE_string('host', socket.gethostname(), @@ -354,3 +356,7 @@ DEFINE_string('host', socket.gethostname(), DEFINE_string('node_availability_zone', 'nova', 'availability zone of this node') + +DEFINE_string('zone_name', 'nova', 'name of this zone') +DEFINE_string('zone_capabilities', 'kypervisor:xenserver;os:linux', + 'Key/Value tags which represent capabilities of this zone') |