From a28eb94f1a37d0293e05e289b95835ea47832e73 Mon Sep 17 00:00:00 2001 From: Abhijeet Kasurde Date: Wed, 6 Dec 2017 14:06:35 +0530 Subject: [PATCH] VMware: Fix vcenter connection error message (#33621) This fix make error message easily understable which is provided by vcenter or ESXi server. Fixes: #24672 Signed-off-by: Abhijeet Kasurde --- .../modules/cloud/vmware/vsphere_guest.py | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/lib/ansible/modules/cloud/vmware/vsphere_guest.py b/lib/ansible/modules/cloud/vmware/vsphere_guest.py index 51ed37e1be2..049ea178c75 100644 --- a/lib/ansible/modules/cloud/vmware/vsphere_guest.py +++ b/lib/ansible/modules/cloud/vmware/vsphere_guest.py @@ -299,6 +299,7 @@ EXAMPLES = ''' import os import re import ssl +import socket import traceback HAS_PYSPHERE = False @@ -1797,21 +1798,17 @@ def main(): module.fail_json(msg='pysphere does not support verifying certificates with python < 2.7.9. Either update python or set ' 'validate_certs=False on the task') + if not validate_certs: + ssl._create_default_https_context = ssl._create_unverified_context + try: viserver.connect(vcenter_hostname, username, password) except ssl.SSLError as sslerr: - if '[SSL: CERTIFICATE_VERIFY_FAILED]' in sslerr.strerror: - if not validate_certs: - ssl._create_default_https_context - ssl._create_default_https_context = ssl._create_unverified_context - viserver.connect(vcenter_hostname, username, password) - else: - module.fail_json(msg='Unable to validate the certificate of the vcenter host %s' % vcenter_hostname) - else: - raise - except VIApiException as err: - module.fail_json(msg="Cannot connect to %s: %s" % - (vcenter_hostname, to_native(err)), + module.fail_json(msg='Unable to validate the certificate of the vcenter hostname %s. Due to %s' % (vcenter_hostname, sslerr)) + except socket.gaierror as err: + module.fail_json(msg="Unable to resolve name for vcenter hostname: %s. Due to %s" % (vcenter_hostname, to_native(err))) + except (TypeError, VIApiException) as err: + module.fail_json(msg="Cannot connect to %s: %s" % (vcenter_hostname, to_native(err)), exception=traceback.format_exc()) # Check if the VM exists before continuing