summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@yahoo.com>2010-09-10 22:42:51 -0700
committerVishvananda Ishaya <vishvananda@yahoo.com>2010-09-10 22:42:51 -0700
commit38070f19036dcf24367429bcc79ffb55fad4b3cd (patch)
treeade2168c079a4ae6ee11fe8eeeee7af009bbcd94
parentbc265bbc9b3b42e46e044c18252218a375192123 (diff)
downloadnova-38070f19036dcf24367429bcc79ffb55fad4b3cd.tar.gz
nova-38070f19036dcf24367429bcc79ffb55fad4b3cd.tar.xz
nova-38070f19036dcf24367429bcc79ffb55fad4b3cd.zip
it is called regionEndpoint, and use pipe as a separator
-rw-r--r--nova/endpoint/cloud.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/endpoint/cloud.py b/nova/endpoint/cloud.py
index 180af0540..02eb50b19 100644
--- a/nova/endpoint/cloud.py
+++ b/nova/endpoint/cloud.py
@@ -177,12 +177,12 @@ class CloudController(object):
if FLAGS.region_list:
regions = []
for region in FLAGS.region_list:
- name, _sep, url = region.partition(',')
+ name, _sep, url = region.partition('|')
regions.append({'regionName': name,
- 'regionUrl': url})
+ 'regionEndpoint': url})
else:
regions = [{'regionName': 'nova',
- 'regionUrl': FLAGS.ec2_url}]
+ 'regionEndpoint': FLAGS.ec2_url}]
if region_name:
regions = [r for r in regions if r['regionName'] in region_name]
return {'regionInfo': regions }