diff options
| author | Salvatore Orlando <salvatore.orlando@eu.citrix.com> | 2011-03-10 11:13:01 +0000 |
|---|---|---|
| committer | Salvatore Orlando <salvatore.orlando@eu.citrix.com> | 2011-03-10 11:13:01 +0000 |
| commit | 3e3da6619a946db843533fafe33d6280948632fc (patch) | |
| tree | ba2972b6a772fe9138441e8c9336006599d4df66 /nova/flags.py | |
| parent | e7626da8ade4a3d29d441fed1c21c50cbc9928de (diff) | |
| parent | 144fa5082108f306595c5314f40d7e87cb577278 (diff) | |
Merge trunk
Conflicts solved
Diffstat (limited to 'nova/flags.py')
| -rw-r--r-- | nova/flags.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/flags.py b/nova/flags.py index 8cf199b2f..62cbf30ca 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(), |