ansible-collections/google.cloud
1
0
Fork 0
mirror of https://github.com/ansible-collections/google.cloud.git synced 2025-04-09 04:10:27 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

add more consistent extension matching for inventory plugins (#46786)

Browse source 
* Add consistent extension matching for inventory plugins that support YAML configuration files

* Document extension matching expectations
This commit is contained in:
Sloane Hertel 2018-10-11 12:06:52 -04:00 • committed by Alex Stephen
parent 88743d11ae
commit 673c7cd803
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
plugins/inventory/gcp_compute.py
View file

@ -16,7 +16,7 @@ DOCUMENTATION = '''
- inventory_cache - inventory_cache
description: description:
- Get inventory hosts from Google Cloud Platform GCE. - Get inventory hosts from Google Cloud Platform GCE.
- Uses a <name>.gcp.yaml (or <name>.gcp.yml) YAML configuration file. - Uses a YAML configuration file that ends with gcp_compute.(yml|yaml) or gcp.(yml|yaml).
options: options:
plugin: plugin:
description: token that ensures this is a source file for the 'gcp_compute' plugin. description: token that ensures this is a source file for the 'gcp_compute' plugin.
@ -120,9 +120,9 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
:return the contents of the config file :return the contents of the config file
''' '''
if super(InventoryModule, self).verify_file(path): if super(InventoryModule, self).verify_file(path):
if path.endswith('.gcp.yml') or path.endswith('.gcp.yaml'): if path.endswith(('gcp.yml', 'gcp.yaml')):
return True return True
elif path.endswith('.gcp_compute.yml') or path.endswith('.gcp_compute.yaml'): elif path.endswith(('gcp_compute.yml', 'gcp_compute.yaml')):
return True return True
return False return False
@ -317,8 +317,7 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
super(InventoryModule, self).parse(inventory, loader, path) super(InventoryModule, self).parse(inventory, loader, path)
config_data = {} config_data = {}
if self.verify_file(path): config_data = self._read_config_data(path)
config_data = self._read_config_data(path)
# get user specifications # get user specifications
if 'zones' in config_data: if 'zones' in config_data: