summaryrefslogtreecommitdiffstats
path: root/nova/flags.py
diff options
context:
space:
mode:
authorTodd Willey <todd@ansolabs.com>2011-06-23 14:07:00 -0400
committerTodd Willey <todd@ansolabs.com>2011-06-23 14:07:00 -0400
commitef140fe4bd190e4419a523f2a1a3bad5e867e2cf (patch)
tree893704ab2629bee040073b3ee932cb7888229b35 /nova/flags.py
parentd1b6ebb4009e13ac2cf2309275a66a634e4f9171 (diff)
parent203f3f85b6d66735f52013cbe5a736ef82d7a083 (diff)
Merge provider-fw-rules.
Diffstat (limited to 'nova/flags.py')
-rw-r--r--nova/flags.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/flags.py b/nova/flags.py
index acfcf8d68..57a4ecf2f 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -272,7 +272,7 @@ DEFINE_string('aws_access_key_id', 'admin', 'AWS Access ID')
DEFINE_string('aws_secret_access_key', 'admin', 'AWS Access Key')
# NOTE(sirp): my_ip interpolation doesn't work within nested structures
DEFINE_list('glance_api_servers',
- ['127.0.0.1:9292'],
+ ['%s:9292' % _get_my_ip()],
'list of glance api servers available to nova (host:port)')
DEFINE_integer('s3_port', 3333, 's3 port')
DEFINE_string('s3_host', '$my_ip', 's3 host (for infrastructure)')
@@ -364,7 +364,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.glance.GlanceImageService',
'The service to use for retrieving and searching for images.')
DEFINE_string('host', socket.gethostname(),