cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

ansible-galaxy - source deps from all servers and not just parent - 2.10 (#72684)

Browse source 
* Added integration tests for this scenario

(cherry picked from commit fb092a82a1)

* Slight tweak to galaxy source selection (#72685)

(cherry picked from commit 18e5628b19)
This commit is contained in:
Jordan Borean 2020-12-08 10:08:23 +10:00 committed by GitHub
parent 71ef981191
commit c67d7225e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
changelogs/fragments/galaxy-servers.yml Normal file
View file

@ -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.

2
lib/ansible/galaxy/collection.py
View file

@ -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)