summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorBrian Coca <bcoca@users.noreply.github.com>2017-11-16 13:49:57 -0500
committerGitHub <noreply@github.com>2017-11-16 13:49:57 -0500
commit23b1dbacaf8a20f7147de0f67f8d6c67de2142ef (patch)
treeec133845298a5d8f075f2c2b96c0178bf81565af /bin
parent46c4f6311a5149bd7d049c763fd6c2013a100b72 (diff)
downloadansible-23b1dbacaf8a20f7147de0f67f8d6c67de2142ef.tar.gz
Config continued (#31024)
* included inventory and callback in new config allow inventory to be configurable updated connection options settings also updated winrm to work with new configs removed now obsolete set_host_overrides added notes for future bcoca, current one is just punting, it's future's problem updated docs per feedback added remove group/host methods to inv data moved fact cache from data to constructed cleaner/better options fix when vars are added extended ignore list to config dicts updated paramiko connection docs removed options from base that paramiko already handles left the look option as it is used by other plugin types resolve delegation updated cache doc options fixed test_script better fragment merge for options fixed proxy command restore ini for proxy normalized options moved pipelining to class updates for host_key_checking restructured mixins * fix typo
Diffstat (limited to 'bin')
-rwxr-xr-xbin/ansible-connection5
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/ansible-connection b/bin/ansible-connection
index ced24ee47b..e97408ea52 100755
--- a/bin/ansible-connection
+++ b/bin/ansible-connection
@@ -65,6 +65,7 @@ class ConnectionProcess(object):
self.play_context.private_key_file = os.path.join(self.original_path, self.play_context.private_key_file)
self.connection = connection_loader.get(self.play_context.connection, self.play_context, '/dev/null')
+ self.connection.set_options()
self.connection._connect()
self.srv.register(self.connection)
messages.append('connection to remote device started successfully')
@@ -143,7 +144,7 @@ class ConnectionProcess(object):
if self.connection:
self.connection.close()
- except:
+ except Exception:
pass
finally:
@@ -271,7 +272,7 @@ def main():
wfd = os.fdopen(w, 'w')
process = ConnectionProcess(wfd, play_context, socket_path, original_path)
process.start()
- except Exception as exc:
+ except Exception:
messages.append(traceback.format_exc())
rc = 1