cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Ovirt host facts fix (#57793)

Browse source 
* ovirt host facts fix (#57790)

* add changelog
This commit is contained in:
Martin Nečas 2019-06-17 22:01:47 +02:00 committed by Toshio Kuratomi
parent 9e100212e2
commit dd678197d3
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/57790-ovirt_host_facts_fix.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- Don't return nested information in ovirt_host_facts when fetch_nested is false

9
lib/ansible/modules/cloud/ovirt/ovirt_host_facts.py
View file

@ -79,11 +79,11 @@ from ansible.module_utils.ovirt import (
) )
def get_filtered_hosts(cluster_version, hosts): def get_filtered_hosts(cluster_version, hosts, connection):
# Filtering by cluster version returns only those which have same cluster version as input # Filtering by cluster version returns only those which have same cluster version as input
filtered_hosts = [] filtered_hosts = []
for host in hosts: for host in hosts:
cluster = host.cluster cluster = connection.follow_link(host.cluster)
cluster_version_host = str(cluster.version.major) + '.' + str(cluster.version.minor) cluster_version_host = str(cluster.version.major) + '.' + str(cluster.version.minor)
if cluster_version_host == cluster_version: if cluster_version_host == cluster_version:
filtered_hosts.append(host) filtered_hosts.append(host)
@ -106,12 +106,11 @@ def main():
hosts_service = connection.system_service().hosts_service() hosts_service = connection.system_service().hosts_service()
hosts = hosts_service.list( hosts = hosts_service.list(
search=module.params['pattern'], search=module.params['pattern'],
all_content=module.params['all_content'], all_content=module.params['all_content']
follow='cluster',
) )
cluster_version = module.params.get('cluster_version') cluster_version = module.params.get('cluster_version')
if cluster_version is not None: if cluster_version is not None:
hosts = get_filtered_hosts(cluster_version, hosts) hosts = get_filtered_hosts(cluster_version, hosts, connection)
module.exit_json( module.exit_json(
changed=False, changed=False,
ansible_facts=dict( ansible_facts=dict(