From 62fc62a3c506929844b57f213c218a7b7d80db47 Mon Sep 17 00:00:00 2001 From: tpage Date: Wed, 7 Jul 2021 15:31:32 +0100 Subject: [PATCH] Default source_project for inventory source to organization Signed-off-by: tpage --- awx_collection/plugins/modules/inventory_source.py | 5 ++++- .../targets/inventory_source_update/tasks/main.yml | 8 ++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/awx_collection/plugins/modules/inventory_source.py b/awx_collection/plugins/modules/inventory_source.py index 78a58e031f..1072ff1314 100644 --- a/awx_collection/plugins/modules/inventory_source.py +++ b/awx_collection/plugins/modules/inventory_source.py @@ -256,7 +256,10 @@ def main(): if ee is not None: inventory_source_fields['execution_environment'] = module.resolve_name_to_id('execution_environments', ee) if source_project is not None: - inventory_source_fields['source_project'] = module.resolve_name_to_id('projects', source_project) + source_project_object = module.get_one('projects', name_or_id=source_project, data=lookup_data) + if not source_project_object: + module.fail_json(msg='The specified source project, {0}, was not found.'.format(lookup_data)) + inventory_source_fields['source_project'] = source_project_object['id'] OPTIONAL_VARS = ( 'description', diff --git a/awx_collection/tests/integration/targets/inventory_source_update/tasks/main.yml b/awx_collection/tests/integration/targets/inventory_source_update/tasks/main.yml index 8af4d5589c..bc9182bb68 100644 --- a/awx_collection/tests/integration/targets/inventory_source_update/tasks/main.yml +++ b/awx_collection/tests/integration/targets/inventory_source_update/tasks/main.yml @@ -28,6 +28,14 @@ scm_url: https://github.com/ansible/test-playbooks wait: true + - name: Create a git project with same name, different org + project: + name: "{{ project_name }}" + organization: Default + scm_type: git + scm_url: https://github.com/ansible/test-playbooks + wait: true + - name: Create an Inventory inventory: name: "{{ inv_name }}"