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

update to incorporate requested changes, change approve to 201 response.

Browse Source
This commit is contained in:
sean-m-sullivan
2020-10-19 15:11:19 -05:00
parent 862cd974ff
commit 91ef686fe0
3 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
awx_collection/plugins/module_utils/tower_api.py
View File

@@ -382,7 +382,7 @@ class TowerAPIModule(TowerModule):
if auto_exit:
self.exit_json(**self.json_output)
else:
return None
return self.json_output
def modify_associations(self, association_endpoint, new_association_list):
# if we got None instead of [] we are not modifying the association_list
@@ -438,16 +438,8 @@ class TowerAPIModule(TowerModule):
response = self.post_endpoint(endpoint, **{'data': new_item})
if response['status_code'] == 201:
self.json_output['name'] = 'unknown'
for key in ('name', 'username', 'identifier', 'hostname'):
if key in response['json']:
self.json_output['name'] = response['json'][key]
self.json_output['id'] = response['json']['id']
self.json_output['changed'] = True
item_url = response['json']['url']
# 200 is response from approval node creation
elif response['status_code'] == 200 and item_type == 'workflow_job_template_approval_node':
if response['status_code'] == 201:
self.json_output['name'] = 'unknown'
for key in ('name', 'username', 'identifier', 'hostname'):
if key in response['json']:

2
awx_collection/plugins/modules/tower_workflow_job_template_node.py
View File

@@ -319,7 +319,7 @@ def main():
# Due to not able to lookup workflow_approval_templates, find the existing item in another place
if workflow_job_template_node['related'].get('unified_job_template') is not None:
existing_item = module.get_endpoint(workflow_job_template_node['related']['unified_job_template'])['json']
approval_endpoint = 'workflow_job_template_nodes/' + str(workflow_job_template_node_id) + '/create_approval_template/'
approval_endpoint = 'workflow_job_template_nodes/{0}/create_approval_template/'.format(workflow_job_template_node_id)
module.create_or_update_if_needed(
existing_item, new_fields,
endpoint=approval_endpoint, item_type='workflow_job_template_approval_node',