diff options
| author | Soren Hansen <soren.hansen@rackspace.com> | 2010-12-14 18:11:30 +0100 |
|---|---|---|
| committer | Soren Hansen <soren.hansen@rackspace.com> | 2010-12-14 18:11:30 +0100 |
| commit | 31c1407f7fe39b5a366e75b3131769efbfb50b57 (patch) | |
| tree | 44a5e436b947934676cd1e3b7f1d0b1f28a062a8 /nova/flags.py | |
| parent | bfe019e0de486eea09e4702262cd228791a4694c (diff) | |
| parent | 911f11139926a772a5d90b8ec65cc4cb7ad850e9 (diff) | |
| download | nova-31c1407f7fe39b5a366e75b3131769efbfb50b57.tar.gz nova-31c1407f7fe39b5a366e75b3131769efbfb50b57.tar.xz nova-31c1407f7fe39b5a366e75b3131769efbfb50b57.zip | |
Merge trunk
Diffstat (limited to 'nova/flags.py')
| -rw-r--r-- | nova/flags.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/nova/flags.py b/nova/flags.py index be81fd7ed..45f5d7469 100644 --- a/nova/flags.py +++ b/nova/flags.py @@ -223,8 +223,6 @@ DEFINE_string('rabbit_virtual_host', '/', 'rabbit virtual host') DEFINE_integer('rabbit_retry_interval', 10, 'rabbit connection retry interval') DEFINE_integer('rabbit_max_retries', 12, 'rabbit connection attempts') DEFINE_string('control_exchange', 'nova', 'the main exchange to connect to') -DEFINE_string('cc_host', '127.0.0.1', 'ip of api server') -DEFINE_integer('cc_port', 8773, 'cloud controller port') DEFINE_string('ec2_url', 'http://127.0.0.1:8773/services/Cloud', 'Url to ec2 api server') @@ -264,7 +262,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.local.LocalImageService', +DEFINE_string('image_service', 'nova.image.s3.S3ImageService', 'The service to use for retrieving and searching for images.') DEFINE_string('host', socket.gethostname(), |