External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-19 23:07:42 -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):

7
awx_collection/plugins/modules/tower_inventory_source_update.py
View File

@@ -107,17 +107,16 @@ def main():
interval = module.params.get('interval')
timeout = module.params.get('timeout')
lookup_data = {'name': inventory}
lookup_data = {}
if organization:
lookup_data['organization'] = module.resolve_name_to_id('organizations', organization)
inventory_object = module.get_one('inventories', data=lookup_data)
inventory_object = module.get_one('inventories', name_or_id=inventory, data=lookup_data)
if not inventory_object:
module.fail_json(msg='The specified inventory, {0}, was not found.'.format(lookup_data))
inventory_source_object = module.get_one('inventory_sources', **{
inventory_source_object = module.get_one('inventory_sources', name_or_id=inventory_source, **{
'data': {
'name': inventory_source,
'inventory': inventory_object['id'],
}
})

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

@@ -436,7 +436,7 @@ def main():
'become_enabled', 'diff_mode', 'allow_simultaneous', 'custom_virtualenv', 'job_slice_count', 'webhook_service',
):
field_val = module.params.get(field_name)
if field_val:
if field_val is not None:
new_fields[field_name] = field_val
# Special treatment of extra_vars parameter