From bca7f1fe2296122b6d6ae1d3f58ec0abac77af09 Mon Sep 17 00:00:00 2001 From: James Cassell Date: Thu, 11 Apr 2019 15:09:29 -0400 Subject: [PATCH] [stable-2.8] vmware_tools: ignore absence of urllib3 (cherry picked from commit 05fe9ef) Co-authored-by: James Cassell --- lib/ansible/plugins/connection/vmware_tools.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/ansible/plugins/connection/vmware_tools.py b/lib/ansible/plugins/connection/vmware_tools.py index 0e561cffd5f..a436d88b81e 100644 --- a/lib/ansible/plugins/connection/vmware_tools.py +++ b/lib/ansible/plugins/connection/vmware_tools.py @@ -10,9 +10,16 @@ from os.path import exists, getsize from socket import gaierror from ssl import SSLEOFError, SSLError from time import sleep -import urllib3 import traceback +URLLIB3_IMP_ERR = None +try: + import urllib3 + HAS_URLLIB3 = True +except ImportError: + URLLIB3_IMP_ER = traceback.format_exc() + HAS_URLLIB3 = False + REQUESTS_IMP_ERR = None try: import requests @@ -290,7 +297,7 @@ class Connection(ConnectionBase): if self.validate_certs: connect = SmartConnect else: - if self.get_option("silence_tls_warnings"): + if HAS_URLLIB3 and self.get_option("silence_tls_warnings"): urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) connect = SmartConnectNoSSL