diff options
| -rw-r--r-- | awx/api/views/__init__.py | 2 | ||||
| -rw-r--r-- | awx_collection/plugins/module_utils/tower_api.py | 12 | ||||
| -rw-r--r-- | awx_collection/plugins/modules/tower_workflow_job_template_node.py | 2 |
3 files changed, 4 insertions, 12 deletions
diff --git a/awx/api/views/__init__.py b/awx/api/views/__init__.py index 4f436c8f0e..7b97d82b66 100644 --- a/awx/api/views/__init__.py +++ b/awx/api/views/__init__.py @@ -3043,7 +3043,7 @@ class WorkflowJobTemplateNodeCreateApproval(RetrieveAPIView): approval_template, context=self.get_serializer_context() ).data - return Response(data, status=status.HTTP_200_OK) + return Response(data, status=status.HTTP_201_OK) def check_permissions(self, request): obj = self.get_object().workflow_job_template diff --git a/awx_collection/plugins/module_utils/tower_api.py b/awx_collection/plugins/module_utils/tower_api.py index 643fbd05fc..5c0da5a8cb 100644 --- a/awx_collection/plugins/module_utils/tower_api.py +++ b/awx_collection/plugins/module_utils/tower_api.py @@ -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']: diff --git a/awx_collection/plugins/modules/tower_workflow_job_template_node.py b/awx_collection/plugins/modules/tower_workflow_job_template_node.py index 1718af91e8..5fb6b03e53 100644 --- a/awx_collection/plugins/modules/tower_workflow_job_template_node.py +++ b/awx_collection/plugins/modules/tower_workflow_job_template_node.py @@ -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', |