summaryrefslogtreecommitdiff
path: root/lib/ansible/galaxy
diff options
context:
space:
mode:
authorGreg Sidelinger <gate@ilive4code.net>2016-04-11 01:17:15 -0400
committerGreg Sidelinger <gate@ilive4code.net>2016-04-11 01:17:15 -0400
commit11ffc0bfeeb57b8eb450ab20534308748d2b67fc (patch)
tree7c99455cd33d6d9bcf4ebdaea9071524437dc11f /lib/ansible/galaxy
parent54acdd7eadd974148e8bd3ddfb23fadea6a83ce6 (diff)
downloadansible-11ffc0bfeeb57b8eb450ab20534308748d2b67fc.tar.gz
Fix issue with ansible-galaxy and --ignore-certs
The --ingore-certs flag was not honored for https://server/role.tar.gz roles in the requirements file.
Diffstat (limited to 'lib/ansible/galaxy')
-rw-r--r--lib/ansible/galaxy/role.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/ansible/galaxy/role.py b/lib/ansible/galaxy/role.py
index 7657e12f4c..b5a62c5905 100644
--- a/lib/ansible/galaxy/role.py
+++ b/lib/ansible/galaxy/role.py
@@ -30,6 +30,7 @@ import yaml
from distutils.version import LooseVersion
from shutil import rmtree
+import ansible.constants as C
from ansible.errors import AnsibleError
from ansible.module_utils.urls import open_url
from ansible.playbook.role.requirement import RoleRequirement
@@ -54,6 +55,13 @@ class GalaxyRole(object):
self._metadata = None
self._install_info = None
+ self._validate_certs = not C.GALAXY_IGNORE_CERTS
+
+ # set validate_certs
+ if galaxy.options.ignore_certs:
+ self._validate_certs = False
+ display.vvv('Validate TLS certificates: %s' % self._validate_certs)
+
self.options = galaxy.options
self.galaxy = galaxy
@@ -168,7 +176,7 @@ class GalaxyRole(object):
display.display("- downloading role from %s" % archive_url)
try:
- url_file = open_url(archive_url)
+ url_file = open_url(archive_url, validate_certs=self._validate_certs)
temp_file = tempfile.NamedTemporaryFile(delete=False)
data = url_file.read()
while data: