diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-09 15:30:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-09 15:30:35 +0000 |
| commit | a28bce3453b1732b1c25ea1151f0bd298e2f71e2 (patch) | |
| tree | 5c0592de327b8aaca11984c2797dab8a4e1c46b2 /nova/api | |
| parent | 5970a553e79aa3fae71d85b35ed8a14fd51df296 (diff) | |
| parent | 21b7149c5a9f8a33b337eec44d4a8a9c716781e3 (diff) | |
Merge "Fix instance evacuate with shared storage"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/contrib/evacuate.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nova/api/openstack/compute/contrib/evacuate.py b/nova/api/openstack/compute/contrib/evacuate.py index 7877fa1fd..275cec904 100644 --- a/nova/api/openstack/compute/contrib/evacuate.py +++ b/nova/api/openstack/compute/contrib/evacuate.py @@ -53,6 +53,7 @@ class Controller(wsgi.Controller): on_shared_storage = utils.bool_from_str( evacuate_body["onSharedStorage"]) + password = None if 'adminPass' in evacuate_body: # check that if requested to evacuate server on shared storage # password not specified |