diff options
| author | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-03-17 06:35:00 -0700 |
|---|---|---|
| committer | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-03-17 06:35:00 -0700 |
| commit | 40c27fc4ad4653155b676079f2e2677d18aee9ef (patch) | |
| tree | 27e4f7df372017f1d1583b1255a76238387a5f5f /nova/flags.py | |
| parent | 6f72ba3d88f31e6336725bcffe47fa2bd5f1dba0 (diff) | |
| parent | 699abfe9e645ddbc854b42725247ab8fcd61517e (diff) | |
| download | nova-40c27fc4ad4653155b676079f2e2677d18aee9ef.tar.gz nova-40c27fc4ad4653155b676079f2e2677d18aee9ef.tar.xz nova-40c27fc4ad4653155b676079f2e2677d18aee9ef.zip | |
merge with trunk. moved scheduler_manager into manager. fixed tests
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 7036180fc..c05cef373 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(), |