summaryrefslogtreecommitdiffstats
path: root/nova/flags.py
diff options
context:
space:
mode:
authorJosh Kearney <josh@jk0.org>2011-09-20 12:41:23 -0500
committerJosh Kearney <josh@jk0.org>2011-09-20 12:41:23 -0500
commitbb018b14fb8786090b2cf8b23723fa97defef9ce (patch)
treed807fdcb2d70990d0956d643f9d414304250e503 /nova/flags.py
parent97602419375622006a20f81d0f83fd005c6816ac (diff)
downloadnova-bb018b14fb8786090b2cf8b23723fa97defef9ce.tar.gz
nova-bb018b14fb8786090b2cf8b23723fa97defef9ce.tar.xz
nova-bb018b14fb8786090b2cf8b23723fa97defef9ce.zip
Added function to construct a glance URL and unit test.
Diffstat (limited to 'nova/flags.py')
-rw-r--r--nova/flags.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/flags.py b/nova/flags.py
index 971e78807..ffb313cec 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -271,8 +271,10 @@ DEFINE_string('connection_type', 'libvirt', 'libvirt, xenapi or fake')
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_string('glance_host', _get_my_ip(), 'default glance host')
+DEFINE_integer('glance_port', 9292, 'default glance port')
DEFINE_list('glance_api_servers',
- ['%s:9292' % _get_my_ip()],
+ ['%s:%d' % (FLAGS.glance_host, FLAGS.glance_port)],
'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)')