diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-01-24 18:24:06 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-01-24 18:24:06 +0000 |
| commit | 9ca396778cf3b367fb5ce86d5037dfe92e00426c (patch) | |
| tree | 90fc992f0f1e057cc06df21c64dd80c0f0d06d78 /nova/api | |
| parent | 3b06788ba2e8184e17f875f41ced0bbc0254beac (diff) | |
| parent | fb4638f1cbe17ce0c2e0eb4580f81f3cb787de0f (diff) | |
Fix describe_regions by changing renamed flags. Also added a test to catch future errors.
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, |