openstack
/
nova
Code Issues Proposed changes

Merge "VMware: update get_available_datastores to only use clusters"

This commit is contained in:
Jenkins 2015-02-24 04:14:08 +00:00 committed by Gerrit Code Review
parent c5dfa3dbc7 3bc6f5588b
commit 778713e5d8
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nova/virt/vmwareapi/ds_util.py
View File

@ -341,14 +341,8 @@ def _get_allowed_datastores(data_stores, datastore_regex):
def get_available_datastores(session, cluster=None, datastore_regex=None):
"""Get the datastore list and choose the first local storage."""
if cluster:
mobj = cluster
resource_type = "ClusterComputeResource"
else:
mobj = vm_util.get_host_ref(session)
resource_type = "HostSystem"
ds = session._call_method(vim_util, "get_dynamic_property", mobj,
resource_type, "datastore")
ds = session._call_method(vim_util, "get_dynamic_property", cluster,
"ClusterComputeResource", "datastore")
if not ds:
return []
data_store_mors = ds.ManagedObjectReference