openstack
/
python-openstackclient
Code Issues Proposed changes

Merge "Fix --password in server rebuild"

This commit is contained in:
Jenkins 2013-07-26 18:12:33 +00:00 committed by Gerrit Code Review
parent 3789cdfebe 61beeb7e20
commit ec9b907e78
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openstackclient/compute/v2/server.py
View File

@ -560,8 +560,8 @@ class RebuildServer(show.ShowOne):
compute_client.servers, parsed_args.server)
_password = None
if parsed_args.rebuild_password is not False:
_password = parsed_args.rebuild_password
if parsed_args.password is not False:
_password = parsed_args.password
kwargs = {}
server = server.rebuild(image, _password, **kwargs)