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

Merge pull request #11198 from sean-m-sullivan/name_or_id_workflow_node

Browse Source 
update to allow use of id for unified job template
This commit is contained in:
Bianca Henderson
2021-10-13 15:19:02 -04:00
committed by GitHub
parent 60a357eda1 a28c023cf1
commit 25e69885d0
3 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx_collection/plugins/modules/workflow_job_template.py
View File

@@ -482,20 +482,17 @@ def create_schema_nodes(module, response, schema, workflow_id):
# Lookup Job Template ID
if workflow_node['unified_job_template']['name']:
search_fields = {'name': workflow_node['unified_job_template']['name']}
if workflow_node['unified_job_template']['type'] is None:
module.fail_json(msg='Could not find unified job template type in schema {1}'.format(workflow_node))
if workflow_node['unified_job_template']['type'] == 'inventory_source':
# workflow_node['unified_job_template']['inventory']:
organization_id = module.resolve_name_to_id('organizations', workflow_node['unified_job_template']['inventory']['organization']['name'])
search_fields['organization'] = organization_id
elif workflow_node['unified_job_template']['type'] == 'workflow_approval':
pass
else:
# workflow_node['unified_job_template']['organization']:
organization_id = module.resolve_name_to_id('organizations', workflow_node['unified_job_template']['organization']['name'])
search_fields['organization'] = organization_id
unified_job_template = module.get_one('unified_job_templates', **{'data': search_fields})
unified_job_template = module.get_one('unified_job_templates', name_or_id=workflow_node['unified_job_template']['name'], **{'data': search_fields})
if unified_job_template:
workflow_node_fields['unified_job_template'] = unified_job_template['id']
else:

4
awx_collection/plugins/modules/workflow_job_template_node.py
View File

@@ -310,9 +310,7 @@ def main():
unified_job_template = module.params.get('unified_job_template')
if unified_job_template:
search_fields['name'] = unified_job_template
new_fields['unified_job_template'] = module.get_one('unified_job_templates', **{'data': search_fields})['id']
new_fields['unified_job_template'] = module.get_one('unified_job_templates', name_or_id=unified_job_template, **{'data': search_fields})['id']
inventory = module.params.get('inventory')
if inventory:
new_fields['inventory'] = module.resolve_name_to_id('inventories', inventory)