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

Merge pull request #17 from ansible/devel

Browse Source 
Rebase
This commit is contained in:
Sean Sullivan
2020-10-19 15:56:04 -05:00
committed by GitHub
parent fe55dca661 fb2cea7274
commit f6a1707684
43 changed files with 495 additions and 635 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -400,7 +400,7 @@ class TowerAPIModule(TowerModule):
if response['status_code'] == 204:
self.json_output['changed'] = True
else:
self.fail_json(msg="Failed to disassociate item {0}".format(response['json']['detail']))
self.fail_json(msg="Failed to disassociate item {0}".format(response['json'].get('detail', response['json'])))
# Associate anything that is in new_association_list but not in `association`
for an_id in list(set(new_association_list) - set(existing_associated_ids)):
@@ -408,7 +408,7 @@ class TowerAPIModule(TowerModule):
if response['status_code'] == 204:
self.json_output['changed'] = True
else:
self.fail_json(msg="Failed to associate item {0}".format(response['json']['detail']))
self.fail_json(msg="Failed to associate item {0}".format(response['json'].get('detail', response['json'])))
def create_if_needed(self, existing_item, new_item, endpoint, on_create=None, auto_exit=True, item_type='unknown', associations=None):