diff options
| author | James Cammarata <jimi@sngx.net> | 2015-07-31 23:01:43 -0400 |
|---|---|---|
| committer | James Cammarata <jimi@sngx.net> | 2015-07-31 23:01:43 -0400 |
| commit | 13b8a57d3df432c0e96e85d85f5c82d8c571f5f3 (patch) | |
| tree | f408d350f7d40c2fd2581f2957407295b3f64bc1 | |
| parent | 7c332b63dc6da749fbcf0dfd7e9fae1793201660 (diff) | |
| download | ansible-13b8a57d3df432c0e96e85d85f5c82d8c571f5f3.tar.gz | |
Undo previous travis/tox fixes and fix underlying issue
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | lib/ansible/module_utils/vmware.py | 4 | ||||
| -rw-r--r-- | tox.ini | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index ceed135506..975bc3e35d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,8 +7,8 @@ addons: apt: sources: - deadsnakes - #packages: - # - python2.4 + packages: + - python2.4 install: - pip install tox PyYAML Jinja2 sphinx script: diff --git a/lib/ansible/module_utils/vmware.py b/lib/ansible/module_utils/vmware.py index e2d8c18ca4..6eb612de74 100644 --- a/lib/ansible/module_utils/vmware.py +++ b/lib/ansible/module_utils/vmware.py @@ -122,9 +122,9 @@ def connect_to_api(module, disconnect_atexit=True): if disconnect_atexit: atexit.register(connect.Disconnect, service_instance) return service_instance.RetrieveContent() - except vim.fault.InvalidLogin as invalid_login: + except vim.fault.InvalidLogin, invalid_login: module.fail_json(msg=invalid_login.msg, apierror=str(invalid_login)) - except requests.ConnectionError as connection_error: + except requests.ConnectionError, connection_error: module.fail_json(msg="Unable to connect to vCenter or ESXi API on TCP/443.", apierror=str(connection_error)) @@ -9,12 +9,12 @@ whitelist_externals = make [testenv:py26] commands = python -m compileall -fq -x 'test|samples|contrib/inventory/vagrant.py' . - #python2.4 -m compileall -fq -x 'module_utils/(a10|rax|openstack|ec2|gce).py' lib/ansible/module_utils + python2.4 -m compileall -fq -x 'module_utils/(a10|rax|openstack|ec2|gce).py' lib/ansible/module_utils make tests deps = -r{toxinidir}/test-requirements.txt whitelist_externals = make - #python2.4 + python2.4 [testenv:py27] commands = |