openstack
/
python-novaclient
Code Issues Proposed changes

Merge "Make help description of rescue/unrescue more useful"

This commit is contained in:
Jenkins 2014-05-09 00:58:54 +00:00 committed by Gerrit Code Review
parent 6c95abf3a0 b165900838
commit 02940f20c0
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
novaclient/v1_1/shell.py
View File

@ -1322,13 +1322,15 @@ def do_resume(cs, args):
@utils.arg('server', metavar='<server>', help=_('Name or ID of server.'))
def do_rescue(cs, args):
"""Rescue a server."""
"""Reboots a server into rescue mode, which starts the machine
from the initial image, attaching the current boot disk as secondary.
"""
utils.print_dict(_find_server(cs, args.server).rescue()[1])
@utils.arg('server', metavar='<server>', help=_('Name or ID of server.'))
def do_unrescue(cs, args):
"""Unrescue a server."""
"""Restart the server from normal boot disk again."""
_find_server(cs, args.server).unrescue()

6
novaclient/v3/shell.py
View File

@ -1169,13 +1169,15 @@ def do_resume(cs, args):
@utils.arg('server', metavar='<server>', help='Name or ID of server.')
def do_rescue(cs, args):
"""Rescue a server."""
"""Reboots a server into rescue mode, which starts the machine
from the initial image, attaching the current boot disk as secondary.
"""
utils.print_dict(_find_server(cs, args.server).rescue()[1])
@utils.arg('server', metavar='<server>', help='Name or ID of server.')
def do_unrescue(cs, args):
"""Unrescue a server."""
"""Restart the server from normal boot disk again."""
_find_server(cs, args.server).unrescue()