valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added python/pyvmomi compatibility check to salt.modules.vsphere

Browse Source
This commit is contained in:
Alexandru Bleotu 2017-09-21 12:13:08 -04:00
parent 5f30477a6a
commit 2f55841037
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
salt/modules/vsphere.py
View File

@ -193,7 +193,7 @@ except ImportError:
HAS_JSONSCHEMA = False
try:
from pyVmomi import vim, vmodl
from pyVmomi import vim, vmodl, VmomiSupport
HAS_PYVMOMI = True
except ImportError:
HAS_PYVMOMI = False
@ -211,6 +211,17 @@ __proxyenabled__ = ['esxi', 'esxcluster', 'esxdatacenter']
def __virtual__():
if not HAS_JSONSCHEMA:
return False, 'Execution module did not load: jsonschema not found'
if not HAS_PYVMOMI:
return False, 'Execution module did not load: pyVmomi not found'
# We check the supported vim versions to infer the pyVmomi version
if 'vim25/6.0' in VmomiSupport.versionMap and \
sys.version_info > (2, 7) and sys.version_info < (2, 7, 9):
return False, ('Execution module did not load: Incompatible versions '
'of Python and pyVmomi present. See Issue #29537.')
return __virtualname__