From 38070f19036dcf24367429bcc79ffb55fad4b3cd Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@yahoo.com>
Date: Fri, 10 Sep 2010 22:42:51 -0700
Subject: it is called regionEndpoint, and use pipe as a separator

---
 nova/endpoint/cloud.py | 6 +++---
 1 file 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 }
-- 
cgit