diff options
| author | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-06-13 09:43:41 -0700 |
|---|---|---|
| committer | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-06-13 09:43:41 -0700 |
| commit | 276ecb29455acbbf82bbf99ce2b522eba44a0acc (patch) | |
| tree | f56721c01ae31fc53ff406da4feefb5be8cac02a /nova/flags.py | |
| parent | db3280e5177df92484bf0a52b5f6ed89dfea63dd (diff) | |
| parent | 91e34d37d2907295e892e96ca2c3039c7fbe14bf (diff) | |
| download | nova-276ecb29455acbbf82bbf99ce2b522eba44a0acc.tar.gz nova-276ecb29455acbbf82bbf99ce2b522eba44a0acc.tar.xz nova-276ecb29455acbbf82bbf99ce2b522eba44a0acc.zip | |
trunk merge
Diffstat (limited to 'nova/flags.py')
| -rw-r--r-- | nova/flags.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/nova/flags.py b/nova/flags.py index a8f16c6bb..acfcf8d68 100644 --- a/nova/flags.py +++ b/nova/flags.py @@ -270,8 +270,10 @@ DEFINE_list('region_list', 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') -DEFINE_integer('glance_port', 9292, 'glance port') -DEFINE_string('glance_host', '$my_ip', 'glance host') +# NOTE(sirp): my_ip interpolation doesn't work within nested structures +DEFINE_list('glance_api_servers', + ['127.0.0.1:9292'], + '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)') DEFINE_string('s3_dmz', '$my_ip', 's3 dmz ip (for instances)') |