ansible-collections/google.cloud
1
0
Fork 0
mirror of https://github.com/ansible-collections/google.cloud.git synced 2025-10-02 06:23:30 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

nonetype error (#60603)

Browse source
This commit is contained in:
Alex Stephen 2019-08-16 03:04:32 -07:00
commit 64e9973ae8
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
plugins/inventory/gcp_compute.py
View file

@ -495,13 +495,14 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
# Fetch all instances # Fetch all instances
link = self._instances % project link = self._instances % project
resp = self.fetch_list(params, link, query) resp = self.fetch_list(params, link, query)
for key, value in resp.get('items').items(): if 'items' in resp and resp['items']:
if 'instances' in value: for key, value in resp.get('items').items():
# Key is in format: "zones/europe-west1-b" if 'instances' in value:
zone = key[6:] # Key is in format: "zones/europe-west1-b"
if not zones or zone in zones: zone = key[6:]
self._add_hosts(value['instances'], config_data, project_disks=project_disks) if not zones or zone in zones:
cached_data[project][zone] = value['instances'] self._add_hosts(value['instances'], config_data, project_disks=project_disks)
cached_data[project][zone] = value['instances']
if cache_needs_update: if cache_needs_update:
self._cache[cache_key] = cached_data self._cache[cache_key] = cached_data