diff options
| author | Cerberus <matt.dietz@rackspace.com> | 2011-01-24 12:43:01 -0600 |
|---|---|---|
| committer | Cerberus <matt.dietz@rackspace.com> | 2011-01-24 12:43:01 -0600 |
| commit | 6b0601c12927bc72fb0cba3f88d8f99bee5e63e2 (patch) | |
| tree | 04cd916eb0161e1a34e998ff158c4d20eafb5928 /nova/flags.py | |
| parent | d0008c166ad9df901d8de098cc9fac0a118ae08f (diff) | |
| parent | 671557507ae65ff5521e32f0d6cf2342e3a5af55 (diff) | |
Merge from 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 81e2e36f9..43bc174d2 100644 --- a/nova/flags.py +++ b/nova/flags.py @@ -218,7 +218,7 @@ def _get_my_ip(): DEFINE_string('my_ip', _get_my_ip(), 'host ip address') DEFINE_list('region_list', [], - 'list of region=url pairs separated by commas') + 'list of region=fqdn pairs separated by commas') 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') |