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

VMware: add cluster name in facts (#53056)

Browse source 
Fixes: #45280

Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
This commit is contained in:
Abhijeet Kasurde 2019-03-06 10:15:26 +05:30 committed by GitHub
parent 5fa3d307e8
commit 70f6cdb814
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/module_utils/vmware.py
View file

@ -309,6 +309,8 @@ def gather_vm_facts(content, vm):
try: try:
host = vm.summary.runtime.host host = vm.summary.runtime.host
facts['hw_esxi_host'] = host.summary.config.name facts['hw_esxi_host'] = host.summary.config.name
facts['hw_cluster'] = host.parent.name if host.parent and isinstance(host.parent, vim.ClusterComputeResource) else None
except vim.fault.NoPermission: except vim.fault.NoPermission:
# User does not have read permission for the host system, # User does not have read permission for the host system,
# proceed without this value. This value does not contribute or hamper # proceed without this value. This value does not contribute or hamper

7
lib/ansible/modules/cloud/vmware/vmware_host_facts.py
View file

@ -154,8 +154,15 @@ class VMwareHostFactManager(PyVmomi):
ansible_facts.update(self.get_network_facts()) ansible_facts.update(self.get_network_facts())
ansible_facts.update(self.get_system_facts()) ansible_facts.update(self.get_system_facts())
ansible_facts.update(self.get_vsan_facts()) ansible_facts.update(self.get_vsan_facts())
ansible_facts.update(self.get_cluster_facts())
self.module.exit_json(changed=False, ansible_facts=ansible_facts) self.module.exit_json(changed=False, ansible_facts=ansible_facts)
def get_cluster_facts(self):
cluster_facts = {'cluster': None}
if self.host.parent and isinstance(self.host.parent, vim.ClusterComputeResource):
cluster_facts.update(cluster=self.host.parent.name)
return cluster_facts
def get_vsan_facts(self): def get_vsan_facts(self):
config_mgr = self.host.configManager.vsanSystem config_mgr = self.host.configManager.vsanSystem
if config_mgr is None: if config_mgr is None: