From b66dbc3ccd706780551c0a37faba319555a6f2d8 Mon Sep 17 00:00:00 2001 From: Javier Palacios Date: Sat, 13 Feb 2016 13:25:17 +0100 Subject: [PATCH 1/2] Use custom download url if supplied by galaxy --- lib/ansible/galaxy/role.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/ansible/galaxy/role.py b/lib/ansible/galaxy/role.py index 700664c4cd0173..574cf7e79fdaeb 100644 --- a/lib/ansible/galaxy/role.py +++ b/lib/ansible/galaxy/role.py @@ -219,6 +219,10 @@ def install(self): if role_versions and self.version not in [a.get('name', None) for a in role_versions]: raise AnsibleError("- the specified version (%s) of %s was not found in the list of available versions (%s)." % (self.version, self.name, role_versions)) + matched_version = filter( lambda v : v['name'] == self.version , role_versions ) + if len(matched_version) == 1 : + self.src = matched_version[0].get('url', self.src) or self.src + tmp_file = self.fetch(role_data) else: From 67758974f89217eb3fd32004006786eabad42055 Mon Sep 17 00:00:00 2001 From: Javier Palacios Date: Wed, 9 Mar 2016 22:05:49 +0100 Subject: [PATCH 2/2] Use a non-existing key to hold download url --- lib/ansible/galaxy/role.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ansible/galaxy/role.py b/lib/ansible/galaxy/role.py index 574cf7e79fdaeb..7f3ef2858374ca 100644 --- a/lib/ansible/galaxy/role.py +++ b/lib/ansible/galaxy/role.py @@ -221,7 +221,7 @@ def install(self): matched_version = filter( lambda v : v['name'] == self.version , role_versions ) if len(matched_version) == 1 : - self.src = matched_version[0].get('url', self.src) or self.src + self.src = matched_version[0].get('download', self.src) or self.src tmp_file = self.fetch(role_data)