External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-06 17:07:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4535 from AlanCoding/null_ip

Browse Source 
Allow gce host and public IP hostvars to be null

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2019-08-22 15:07:12 +00:00
committed by GitHub
parent 8566c30557 85b351a0c8
commit 92bc608af3
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/main/models/inventory.py
View File

@@ -2334,6 +2334,12 @@ class gce(PluginFileInjector):
ini_env_reference = 'GCE_INI_PATH' ini_env_reference = 'GCE_INI_PATH'
base_injector = 'managed' base_injector = 'managed'
def get_plugin_env(self, *args, **kwargs):
ret = super(gce, self).get_plugin_env(*args, **kwargs)
# We need native jinja2 types so that ip addresses can give JSON null value
ret['ANSIBLE_JINJA2_NATIVE'] = str(True)
return ret
def get_script_env(self, inventory_update, private_data_dir, private_data_files): def get_script_env(self, inventory_update, private_data_dir, private_data_files):
env = super(gce, self).get_script_env(inventory_update, private_data_dir, private_data_files) env = super(gce, self).get_script_env(inventory_update, private_data_dir, private_data_files)
cred = inventory_update.get_cloud_credential() cred = inventory_update.get_cloud_credential()
@@ -2354,7 +2360,7 @@ class gce(PluginFileInjector):
'gce_name': 'name', 'gce_name': 'name',
'gce_network': 'networkInterfaces[0].network.name', 'gce_network': 'networkInterfaces[0].network.name',
'gce_private_ip': 'networkInterfaces[0].networkIP', 'gce_private_ip': 'networkInterfaces[0].networkIP',
'gce_public_ip': 'networkInterfaces[0].accessConfigs[0].natIP', 'gce_public_ip': 'networkInterfaces[0].accessConfigs[0].natIP | default(None)',
'gce_status': 'status', 'gce_status': 'status',
'gce_subnetwork': 'networkInterfaces[0].subnetwork.name', 'gce_subnetwork': 'networkInterfaces[0].subnetwork.name',
'gce_tags': 'tags.get("items", [])', 'gce_tags': 'tags.get("items", [])',
@@ -2364,7 +2370,7 @@ class gce(PluginFileInjector):
'gce_image': 'image', 'gce_image': 'image',
# We need this as long as hostnames is non-default, otherwise hosts # We need this as long as hostnames is non-default, otherwise hosts
# will not be addressed correctly, was returned in script # will not be addressed correctly, was returned in script
'ansible_ssh_host': 'networkInterfaces[0].accessConfigs[0].natIP' 'ansible_ssh_host': 'networkInterfaces[0].accessConfigs[0].natIP | default(networkInterfaces[0].networkIP)'
} }
def inventory_as_dict(self, inventory_update, private_data_dir): def inventory_as_dict(self, inventory_update, private_data_dir):

1
awx/main/tests/data/inventory/plugins/gce/env.json
View File

@@ -1,4 +1,5 @@
{ {
"ANSIBLE_JINJA2_NATIVE": "True",
"ANSIBLE_TRANSFORM_INVALID_GROUP_CHARS": "never", "ANSIBLE_TRANSFORM_INVALID_GROUP_CHARS": "never",
"GCE_CREDENTIALS_FILE_PATH": "{{ file_reference }}", "GCE_CREDENTIALS_FILE_PATH": "{{ file_reference }}",
"GCP_AUTH_KIND": "serviceaccount", "GCP_AUTH_KIND": "serviceaccount",

4
awx/main/tests/data/inventory/plugins/gce/files/gcp_compute.yml
View File

@@ -1,6 +1,6 @@
auth_kind: serviceaccount auth_kind: serviceaccount
compose: compose:
ansible_ssh_host: networkInterfaces[0].accessConfigs[0].natIP ansible_ssh_host: networkInterfaces[0].accessConfigs[0].natIP | default(networkInterfaces[0].networkIP)
gce_description: description if description else None gce_description: description if description else None
gce_id: id gce_id: id
gce_image: image gce_image: image
@@ -9,7 +9,7 @@ compose:
gce_name: name gce_name: name
gce_network: networkInterfaces[0].network.name gce_network: networkInterfaces[0].network.name
gce_private_ip: networkInterfaces[0].networkIP gce_private_ip: networkInterfaces[0].networkIP
gce_public_ip: networkInterfaces[0].accessConfigs[0].natIP gce_public_ip: networkInterfaces[0].accessConfigs[0].natIP | default(None)
gce_status: status gce_status: status
gce_subnetwork: networkInterfaces[0].subnetwork.name gce_subnetwork: networkInterfaces[0].subnetwork.name
gce_tags: tags.get("items", []) gce_tags: tags.get("items", [])