diff options
| author | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-02-17 16:18:03 -0400 |
|---|---|---|
| committer | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-02-17 16:18:03 -0400 |
| commit | e77f8751dd59e5d650d047a6711c3d137947dda7 (patch) | |
| tree | 7d09de669ac1b1eb312142582ffed4fc4dcc29c4 /nova/api | |
| parent | aa71a25c9f9bf5df3aea781138fa8d69654f06d9 (diff) | |
fixup
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/zones.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/api/openstack/zones.py b/nova/api/openstack/zones.py index bd2c488d9..f75176824 100644 --- a/nova/api/openstack/zones.py +++ b/nova/api/openstack/zones.py @@ -66,7 +66,7 @@ class Controller(wsgi.Controller): def index(self, req): """Return all zones in brief""" # Ask the ZoneManager in the Scheduler for most recent data. - items = self._call_scheduler('get_zone_list', + items = self._call_scheduler('get_zone_list', req.environ['nova.context']) for item in items: item['api_url'] = item['api_url'].replace('\\/', '/') @@ -75,7 +75,7 @@ class Controller(wsgi.Controller): if len(items) == 0: items = db.zone_get_all(req.environ['nova.context']) items = common.limited(items, req) - items = [_exclude_keys(item, ['username', 'password']) + items = [_exclude_keys(item, ['username', 'password']) for item in items] return dict(zones=items) @@ -85,7 +85,7 @@ class Controller(wsgi.Controller): def info(self, req): """Return name and capabilities for this zone.""" - return dict(zone=dict(name=FLAGS.zone_name, + return dict(zone=dict(name=FLAGS.zone_name, capabilities=FLAGS.zone_capabilities)) def show(self, req, id): |