summaryrefslogtreecommitdiff
path: root/openstackclient
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-05-23 16:37:11 +0000
committerGerrit Code Review <review@openstack.org>2015-05-23 16:37:11 +0000
commite72d35031610cb96dcd619e60c13e35fc92325d0 (patch)
tree3c0c0acbc426d624dc702563d1d01732aa21ce0e /openstackclient
parent61cfebb8aa7c20dd8ae5f4a79f57fbb3c38fd104 (diff)
parent7ef9f97b954678972eb8e15309a7f0280df283d5 (diff)
downloadpython-openstackclient-e72d35031610cb96dcd619e60c13e35fc92325d0.tar.gz
Merge "Fix client error while rescuing an instance"
Diffstat (limited to 'openstackclient')
-rw-r--r--openstackclient/compute/v2/server.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
index e4e96ee7..41c1b904 100644
--- a/openstackclient/compute/v2/server.py
+++ b/openstackclient/compute/v2/server.py
@@ -1054,11 +1054,11 @@ class RescueServer(show.ShowOne):
self.log.debug('take_action(%s)', parsed_args)
compute_client = self.app.client_manager.compute
- server = utils.find_resource(
+ _, body = utils.find_resource(
compute_client.servers,
parsed_args.server,
- ).rescue()
- return zip(*sorted(six.iteritems(server._info)))
+ ).rescue()
+ return zip(*sorted(six.iteritems(body)))
class ResizeServer(command.Command):