External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-01 08:48:46 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4319 from AlanCoding/azure_template_errors

Browse Source 
Ignore Azure templating errors

Reviewed-by: Alan Rominger <arominge@redhat.com>
             https://github.com/AlanCoding
This commit is contained in:
softwarefactory-project-zuul[bot]
2019-07-12 19:00:36 +00:00
committed by GitHub
parent a9bb1eba02 612205d56d
commit c626f51dae
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1991,6 +1991,8 @@ class azure_rm(PluginFileInjector):
source_vars = inventory_update.source_vars_dict source_vars = inventory_update.source_vars_dict
ret['fail_on_template_errors'] = False
group_by_hostvar = { group_by_hostvar = {
'location': {'prefix': '', 'separator': '', 'key': 'location'}, 'location': {'prefix': '', 'separator': '', 'key': 'location'},
'tag': {'prefix': '', 'separator': '', 'key': 'tags.keys() | list if tags else []'}, 'tag': {'prefix': '', 'separator': '', 'key': 'tags.keys() | list if tags else []'},

1
awx/main/tests/data/inventory/plugins/azure_rm/files/azure_rm.yml
View File

@@ -4,6 +4,7 @@ default_host_filters: []
exclude_host_filters: exclude_host_filters:
- resource_group not in ['foo_resources', 'bar_resources'] - resource_group not in ['foo_resources', 'bar_resources']
- location not in ['southcentralus', 'westus'] - location not in ['southcentralus', 'westus']
fail_on_template_errors: false
hostvar_expressions: hostvar_expressions:
ansible_host: private_ipv4_addresses[0] ansible_host: private_ipv4_addresses[0]
computer_name: name computer_name: name