From c67d7225e9209787806881d53d969155a6159a39 Mon Sep 17 00:00:00 2001 From: Jordan Borean Date: Tue, 8 Dec 2020 10:08:23 +1000 Subject: [PATCH] ansible-galaxy - source deps from all servers and not just parent - 2.10 (#72684) * Added integration tests for this scenario (cherry picked from commit fb092a82a1a013fd38a37b90b305fc9a8fa11a13) * Slight tweak to galaxy source selection (#72685) (cherry picked from commit 18e5628b1911ec95de914fb3305f87cb88a2b3fe) --- changelogs/fragments/galaxy-servers.yml | 4 ++++ lib/ansible/galaxy/collection.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 changelogs/fragments/galaxy-servers.yml diff --git a/changelogs/fragments/galaxy-servers.yml b/changelogs/fragments/galaxy-servers.yml new file mode 100644 index 00000000000..9e480ccd61b --- /dev/null +++ b/changelogs/fragments/galaxy-servers.yml @@ -0,0 +1,4 @@ +minor_changes: +- > + ansible-galaxy - find any collection dependencies in the globally configured Galaxy servers and not just the server + the parent collection is from. diff --git a/lib/ansible/galaxy/collection.py b/lib/ansible/galaxy/collection.py index 2c03db5cc30..054a8a57b50 100644 --- a/lib/ansible/galaxy/collection.py +++ b/lib/ansible/galaxy/collection.py @@ -1187,7 +1187,7 @@ def _build_dependency_map(collections, existing_collections, b_temp_path, apis, deps_exhausted = False for dep_name, dep_requirement in parent_info.dependencies.items(): _get_collection_info(dependency_map, existing_collections, dep_name, dep_requirement, - parent_info.api, b_temp_path, apis, validate_certs, force_deps, + None, b_temp_path, apis, validate_certs, force_deps, parent=parent, allow_pre_release=allow_pre_release) checked_parents.add(parent)