diff options
| author | Cory Wright <cory.wright@rackspace.com> | 2011-03-10 13:59:43 +0000 |
|---|---|---|
| committer | Cory Wright <cory.wright@rackspace.com> | 2011-03-10 13:59:43 +0000 |
| commit | 43b5d68b51c08be100bdf63571a6426bb1c4f863 (patch) | |
| tree | 10a88775f1e0cb7e0b9e23b650b1fd9078f3118e /nova/flags.py | |
| parent | fb4785b85c1bef4179140cfb85ce01eca9fb5da5 (diff) | |
| parent | 144fa5082108f306595c5314f40d7e87cb577278 (diff) | |
| download | nova-43b5d68b51c08be100bdf63571a6426bb1c4f863.tar.gz nova-43b5d68b51c08be100bdf63571a6426bb1c4f863.tar.xz nova-43b5d68b51c08be100bdf63571a6426bb1c4f863.zip | |
merge trunk
Diffstat (limited to 'nova/flags.py')
| -rw-r--r-- | nova/flags.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/flags.py b/nova/flags.py index 213d4d4e1..62cbf30ca 100644 --- a/nova/flags.py +++ b/nova/flags.py @@ -348,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(), |