ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Added subnetwork parameter to inventory instance dictionary. (#23984)

Browse source
This commit is contained in:
Tom Melendez 2017-04-26 04:44:58 -07:00 committed by John R Barker
parent dde383aea2
commit 9d5c399313
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
contrib/inventory/gce.py
View file

@ -40,6 +40,7 @@ based on the data obtained from the libcloud Node object:
- gce_tags - gce_tags
- gce_metadata - gce_metadata
- gce_network - gce_network
- gce_subnetwork
When run in --list mode, instances are grouped by the following categories: When run in --list mode, instances are grouped by the following categories:
- zone: - zone:
@ -292,6 +293,7 @@ class GceInventory(object):
secrets_found = True secrets_found = True
except: except:
pass pass
if not secrets_found: if not secrets_found:
args = [ args = [
self.config.get('gce','gce_service_account_email_address'), self.config.get('gce','gce_service_account_email_address'),
@ -350,6 +352,9 @@ class GceInventory(object):
md[entry['key']] = entry['value'] md[entry['key']] = entry['value']
net = inst.extra['networkInterfaces'][0]['network'].split('/')[-1] net = inst.extra['networkInterfaces'][0]['network'].split('/')[-1]
subnet = None
if 'subnetwork' in inst.extra['networkInterfaces'][0]:
subnet = inst.extra['networkInterfaces'][0]['subnetwork'].split('/')[-1]
# default to exernal IP unless user has specified they prefer internal # default to exernal IP unless user has specified they prefer internal
if self.ip_type == 'internal': if self.ip_type == 'internal':
ssh_host = inst.private_ips[0] ssh_host = inst.private_ips[0]
@ -370,6 +375,7 @@ class GceInventory(object):
'gce_tags': inst.extra['tags'], 'gce_tags': inst.extra['tags'],
'gce_metadata': md, 'gce_metadata': md,
'gce_network': net, 'gce_network': net,
'gce_subnetwork': subnet,
# Hosts don't have a public name, so we add an IP # Hosts don't have a public name, so we add an IP
'ansible_ssh_host': ssh_host 'ansible_ssh_host': ssh_host
} }