summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Cammarata <jimi@sngx.net>2014-03-12 09:33:19 -0500
committerMichael DeHaan <michael.dehaan@gmail.com>2014-03-12 16:10:48 -0400
commitf4a20feb4d374b2174b027a56ab563cdc06fa57d (patch)
treed4441d9e7ed53bf71606bc52e14feb1eb31d49ca
parent02b2e532db6f00aeee1b7f0b8ad7ec3f853eb04a (diff)
downloadansible-f4a20feb4d374b2174b027a56ab563cdc06fa57d.tar.gz
Remove unused code from get_ca_certs() function
-rw-r--r--lib/ansible/module_utils/urls.py8
1 files changed, 1 insertions, 7 deletions
diff --git a/lib/ansible/module_utils/urls.py b/lib/ansible/module_utils/urls.py
index 878499ce68..2a484a89d6 100644
--- a/lib/ansible/module_utils/urls.py
+++ b/lib/ansible/module_utils/urls.py
@@ -77,11 +77,10 @@ class SSLValidationHandler(urllib2.BaseHandler):
http://techknack.net/python-urllib2-handlers/
'''
- def __init__(self, module, hostname, port, ca_cert=None):
+ def __init__(self, module, hostname, port):
self.module = module
self.hostname = hostname
self.port = port
- self.ca_cert = ca_cert
def get_ca_certs(self):
# tries to find a valid CA cert in one of the
@@ -92,11 +91,6 @@ class SSLValidationHandler(urllib2.BaseHandler):
platform = get_platform()
distribution = get_distribution()
- if self.ca_cert:
- # the user provided a custom CA cert (ie. one they
- # uploaded themselves), so add it to the list first
- ca_certs.append(self.ca_cert)
-
# build a list of paths to check for .crt/.pem files
# based on the platform type
paths_checked.append('/etc/ssl/certs')