diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2012-09-12 10:37:29 -0700 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2012-09-12 10:38:58 -0700 |
| commit | e06d8bc8cd2b9cc98b0105d036479cb3773b30ac (patch) | |
| tree | c18929402c058e93557b4fce608789f2f62f37b5 /nova/api | |
| parent | 511807ed248fbe63cb6642c1cff6e0bd4bb8ae5d (diff) | |
| download | nova-e06d8bc8cd2b9cc98b0105d036479cb3773b30ac.tar.gz nova-e06d8bc8cd2b9cc98b0105d036479cb3773b30ac.tar.xz nova-e06d8bc8cd2b9cc98b0105d036479cb3773b30ac.zip | |
Makes key_name show in details view of servers
The wrong authorizor was being used in the details view and the test
for details was broken. This fixes the test and makes sure that
key_name shows up in details like it is supposed to.
Fixes bug 1043584
Change-Id: I4ff01bbd32759f30e7a31ef2eac9f58922843037
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/contrib/keypairs.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/openstack/compute/contrib/keypairs.py b/nova/api/openstack/compute/contrib/keypairs.py index ab264f9da..dc0c74b11 100644 --- a/nova/api/openstack/compute/contrib/keypairs.py +++ b/nova/api/openstack/compute/contrib/keypairs.py @@ -175,7 +175,7 @@ class Controller(servers.Controller): @wsgi.extends def detail(self, req, resp_obj): context = req.environ['nova.context'] - if 'servers' in resp_obj.obj and authorize(context): + if 'servers' in resp_obj.obj and soft_authorize(context): resp_obj.attach(xml=ServersKeyNameTemplate()) servers = resp_obj.obj['servers'] self._add_key_name(req, servers) |