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/api | |
| parent | d0008c166ad9df901d8de098cc9fac0a118ae08f (diff) | |
| parent | 671557507ae65ff5521e32f0d6cf2342e3a5af55 (diff) | |
Merge from trunk
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index f63ec9085..43b9a88e1 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -252,18 +252,18 @@ class CloudController(object): regions = [] for region in FLAGS.region_list: name, _sep, host = region.partition('=') - endpoint = '%s://%s:%s%s' % (FLAGS.ec2_prefix, + endpoint = '%s://%s:%s%s' % (FLAGS.ec2_scheme, host, FLAGS.ec2_port, - FLAGS.ec2_suffix) + FLAGS.ec2_path) regions.append({'regionName': name, 'regionEndpoint': endpoint}) else: regions = [{'regionName': 'nova', - 'regionEndpoint': '%s://%s:%s%s' % (FLAGS.ec2_prefix, + 'regionEndpoint': '%s://%s:%s%s' % (FLAGS.ec2_scheme, FLAGS.ec2_host, FLAGS.ec2_port, - FLAGS.ec2_suffix)}] + FLAGS.ec2_path)}] return {'regionInfo': regions} def describe_snapshots(self, |