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

Fix galaxy url use everywhere when url is set in config. (#63286)

Browse source 
In addition to trying the configured url (for ex, a migrated
'https://galaxy.ansible.com/') there is an attempt at that
URL with '/api' postpended.

If the extended URL works, update GalaxyAPI.api_server to
use the extended URL. Previously it only used it for finding
the API root info ('available_versions', etc)
This commit is contained in:
Adrian Likins 2019-10-09 16:24:46 -04:00 committed by Sam Doran
parent 5349b3ae4c
commit ed203c5902
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/galaxy/api.py
View file

@ -57,6 +57,10 @@ def g_connect(versions):
raise AnsibleError("Tried to find galaxy API root at %s but no 'available_versions' are available on %s" raise AnsibleError("Tried to find galaxy API root at %s but no 'available_versions' are available on %s"
% (n_url, self.api_server)) % (n_url, self.api_server))
# Update api_server to point to the "real" API root, which in this case
# was the configured url + '/api/' appended.
self.api_server = n_url
# Default to only supporting v1, if only v1 is returned we also assume that v2 is available even though # Default to only supporting v1, if only v1 is returned we also assume that v2 is available even though
# it isn't returned in the available_versions dict. # it isn't returned in the available_versions dict.
available_versions = data.get('available_versions', {u'v1': u'v1/'}) available_versions = data.get('available_versions', {u'v1': u'v1/'})