summaryrefslogtreecommitdiffstats
path: root/nova/virt
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-05-09 15:20:39 +0000
committerGerrit Code Review <review@openstack.org>2013-05-09 15:20:39 +0000
commit623ab8ab66df1a950f3a2af71e30699c1380b4f2 (patch)
tree75cf443d44c7bf8194ba0139637e51a5e8051d69 /nova/virt
parent33b966771b672996a7b0d9608f1f7b8684cc459f (diff)
parentaeef5c3f1917969fc2dc524346784b197729a9e9 (diff)
Merge "Fix variable referenced before assginment in vmwareapi code."
Diffstat (limited to 'nova/virt')
-rw-r--r--nova/virt/vmwareapi/vm_util.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/nova/virt/vmwareapi/vm_util.py b/nova/virt/vmwareapi/vm_util.py
index 9fb8e9bd5..4287b4eaa 100644
--- a/nova/virt/vmwareapi/vm_util.py
+++ b/nova/virt/vmwareapi/vm_util.py
@@ -553,7 +553,6 @@ def get_datastore_ref_and_name(session, cluster=None, host=None):
"Datastore", data_store_mors,
["summary.type", "summary.name",
"summary.capacity", "summary.freeSpace"])
-
for elem in data_stores:
ds_name = None
ds_type = None
@@ -570,8 +569,6 @@ def get_datastore_ref_and_name(session, cluster=None, host=None):
ds_free = prop.val
# Local storage identifier
if ds_type == "VMFS" or ds_type == "NFS":
- data_store_name = ds_name
- return elem.obj, data_store_name, ds_cap, ds_free
+ return elem.obj, ds_name, ds_cap, ds_free
- if data_store_name is None:
raise exception.DatastoreNotFound()