diff options
| author | James Cammarata <jimi@sngx.net> | 2013-09-19 08:12:43 -0500 |
|---|---|---|
| committer | James Cammarata <jimi@sngx.net> | 2013-09-19 10:50:11 -0500 |
| commit | 96bd107179577f7af151166162199fd431486391 (patch) | |
| tree | 5085dfb755f4e36a92612fa0add68de8347b929b | |
| parent | 1541d309e1abb5f89d9782f7d3f1084248102288 (diff) | |
| download | ansible-96bd107179577f7af151166162199fd431486391.tar.gz | |
Minor change to -vvvv mode to only show debugging info for ssh conns
Also added this feature to the CHANGELOG
Conflicts:
CHANGELOG.md
| -rw-r--r-- | CHANGELOG.md | 6 | ||||
| -rw-r--r-- | lib/ansible/runner/__init__.py | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index ecf30fdbfa..b4669e40a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,12 @@ Misc changes: * TBA +1.3.2 "Top of the World" (reprise) - September 19th, 2013 + +* The ControlPath variable for ssh connections is now configurable in the ansible.cfg (and via the environment variable ANSIBLE_SSH_CONTROL_PATH). +* Added a -vvvv level, which will show SSH client debugging information in the event of a failure. +* Fixed bug in apt_repository module where the repository cache was not being updated. + 1.3.1 "Top of the World" (reprise) - September 16th, 2013 * Fixing a bug in accelerate mode whereby the gather_facts step would always be run via sudo regardless of the play settings. diff --git a/lib/ansible/runner/__init__.py b/lib/ansible/runner/__init__.py index aca5bbb5e4..ef025dfb31 100644 --- a/lib/ansible/runner/__init__.py +++ b/lib/ansible/runner/__init__.py @@ -771,7 +771,7 @@ class Runner(object): if result['rc'] != 0: if result['rc'] == 5: output = 'Authentication failure.' - elif result['rc'] == 255: + elif result['rc'] == 255 and self.transport == 'ssh': if utils.VERBOSITY > 3: output = 'SSH encountered an unknown error. The output was:\n%s' % (result['stdout']+result['stderr']) else: |