summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorKravchenko Pavel <kpavel@il.ibm.com>2013-03-08 16:13:30 +0200
committerKravchenko Pavel <kpavel@il.ibm.com>2013-03-08 16:16:16 +0200
commit21b7149c5a9f8a33b337eec44d4a8a9c716781e3 (patch)
treed9772a8c9d44d15f5a6dbbbf35ce37e9cacd593e /nova/api
parentb0998792222bd3aede65feeb32d1c2d6e6f8080b (diff)
Fix instance evacuate with shared storage
Fixes instance evacuation problem when --on-shared-storage flag specified. The problem occurs as the password variable ends up being accessed before it is assigned. Also adds missing test case. Fixes bug 1152492 Change-Id: I461c0f7fcf8835028f7529a7860fb330d1759d68
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/compute/contrib/evacuate.py1
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