From 49993a55e5012c62db88ae726dc7749c12a3ac0d Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Wed, 19 Dec 2018 10:46:58 -0500 Subject: [PATCH] dont think all files are valid cause libs present (#50103) verify_file was improperly always returning true if pyvimomi and requests libs were correct moved library checking to parse, avoid unneded errors unless the file is actually meant for this plugin --- .../plugins/inventory/vmware_vm_inventory.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/lib/ansible/plugins/inventory/vmware_vm_inventory.py b/lib/ansible/plugins/inventory/vmware_vm_inventory.py index c94eb76965d..70ba323066f 100644 --- a/lib/ansible/plugins/inventory/vmware_vm_inventory.py +++ b/lib/ansible/plugins/inventory/vmware_vm_inventory.py @@ -229,13 +229,19 @@ class InventoryModule(BaseInventoryPlugin, Cacheable): if path.endswith(('vmware.yaml', 'vmware.yml')): valid = True + return valid + + def parse(self, inventory, loader, path, cache=True): + """ + Parses the inventory file + """ + if not HAS_REQUESTS: raise AnsibleParserError('Please install "requests" Python module as this is required' ' for VMware Guest dynamic inventory plugin.') elif not HAS_PYVMOMI: raise AnsibleParserError('Please install "PyVmomi" Python module as this is required' ' for VMware Guest dynamic inventory plugin.') - if HAS_REQUESTS: # Pyvmomi 5.5 and onwards requires requests 2.3 # https://github.com/vmware/pyvmomi/blob/master/requirements.txt @@ -250,14 +256,7 @@ class InventoryModule(BaseInventoryPlugin, Cacheable): raise AnsibleParserError("'requests' library version should" " be >= %s, found: %s." % (".".join([str(w) for w in required_version]), requests.__version__)) - valid = True - return valid - - def parse(self, inventory, loader, path, cache=True): - """ - Parses the inventory file - """ super(InventoryModule, self).parse(inventory, loader, path, cache=cache) cache_key = self.get_cache_key(path)