summaryrefslogtreecommitdiff
path: root/openstackclient
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-03-10 16:40:50 +0000
committerGerrit Code Review <review@openstack.org>2014-03-10 16:40:50 +0000
commitcf8506d2bdbde02a731afb16a839e0660b71a89b (patch)
tree259a0afae6c1d0a63cb9da454ca88c17e27ce585 /openstackclient
parent46322387b6e8a6957c50655dffb227452b36c628 (diff)
parent27ebdeb57dd78564770ef92b95bc659b25e10a69 (diff)
downloadpython-openstackclient-cf8506d2bdbde02a731afb16a839e0660b71a89b.tar.gz
Merge "Fix 'keypair show' command output"
Diffstat (limited to 'openstackclient')
-rw-r--r--openstackclient/compute/v2/keypair.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/openstackclient/compute/v2/keypair.py b/openstackclient/compute/v2/keypair.py
index d68dae06..8a91f682 100644
--- a/openstackclient/compute/v2/keypair.py
+++ b/openstackclient/compute/v2/keypair.py
@@ -146,7 +146,7 @@ class ShowKeypair(show.ShowOne):
parsed_args.name)
info = {}
- info.update(keypair._info['keypair'])
+ info.update(keypair._info)
if not parsed_args.public_key:
del info['public_key']
return zip(*sorted(six.iteritems(info)))