summaryrefslogtreecommitdiff
path: root/openstackclient
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-07-26 18:12:33 +0000
committerGerrit Code Review <review@openstack.org>2013-07-26 18:12:33 +0000
commitec9b907e780a16a5e4f8b6997b15473e44a93183 (patch)
tree85f1d968a17759e8ce0bc6393a954baecb2893a9 /openstackclient
parent3789cdfebe2d84fd77a4549dbdb08346f5d8e280 (diff)
parent61beeb7e203eda719e167d1fd2740f0b3225e11f (diff)
downloadpython-openstackclient-ec9b907e780a16a5e4f8b6997b15473e44a93183.tar.gz
Merge "Fix --password in server rebuild"
Diffstat (limited to 'openstackclient')
-rw-r--r--openstackclient/compute/v2/server.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
index 5922f759..ce2390d7 100644
--- a/openstackclient/compute/v2/server.py
+++ b/openstackclient/compute/v2/server.py
@@ -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)