saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix logic to list hosts

Browse source
This commit is contained in:
Alexandru Bleotu 2017-09-26 17:29:01 -04:00
parent 951d43e0a9
commit 2e2b01e57c
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/modules/vsphere.py
View file

@ -5941,7 +5941,7 @@ def list_hosts_via_proxy(hostnames=None, datacenter=None,
raise salt.exceptions.ArgumentValueError(
'Datacenter is required when cluster is specified')
get_all_hosts = False
if not hostnames and not datacenter and not cluster:
if not hostnames:
get_all_hosts = True
hosts = salt.utils.vmware.get_hosts(service_instance,
datacenter_name=datacenter,

24
salt/utils/vmware.py
View file

@ -2290,20 +2290,21 @@ def get_hosts(service_instance, datacenter_name=None, host_names=None,
Default value is False.
'''
properties = ['name']
if cluster_name and not datacenter_name:
raise salt.exceptions.ArgumentValueError(
'Must specify the datacenter when specifying the cluster')
if not host_names:
host_names = []
if get_all_hosts or not datacenter_name:
if not datacenter_name:
# Assume the root folder is the starting point
start_point = get_root_folder(service_instance)
else:
start_point = get_datacenter(service_instance, datacenter_name)
if cluster_name:
# Retrieval to test if cluster exists. Cluster existence only makes
# sense if the datacenter has been specified
cluster = get_cluster(start_point, cluster_name)
properties.append('parent')
if datacenter_name:
start_point = get_datacenter(service_instance, datacenter_name)
if cluster_name:
# Retrieval to test if cluster exists. Cluster existence only makes
# sense if the cluster has been specified
cluster = get_cluster(start_point, cluster_name)
# Search for the objects
hosts = get_mors_with_properties(service_instance,
@ -2316,16 +2317,17 @@ def get_hosts(service_instance, datacenter_name=None, host_names=None,
# Complex conditions checking if a host should be added to the
# filtered list (either due to its name and/or cluster membership)
if get_all_hosts:
filtered_hosts.append(h['object'])
continue
if cluster_name:
if not isinstance(h['parent'], vim.ClusterComputeResource):
continue
parent_name = get_managed_object_name(h['parent'])
if parent_name != cluster_name:
continue
if get_all_hosts:
filtered_hosts.append(h['object'])
continue
if h['name'] in host_names:
filtered_hosts.append(h['object'])
return filtered_hosts